diff --git a/packages/alwatr/package.json b/packages/alwatr/package.json
index 2ba13dc6f..d5f08de2a 100644
--- a/packages/alwatr/package.json
+++ b/packages/alwatr/package.json
@@ -38,9 +38,14 @@
       "require": "./dist/nanolib/node-fs.cjs"
     },
     "./nitrobase": {
-      "types": "./dist/nitrobase.d.ts",
-      "import": "./dist/nitrobase.mjs",
-      "require": "./dist/flux.cjs"
+      "types": "./dist/nitrobase/nitrobase.d.ts",
+      "import": "./dist/nitrobase/nitrobase.mjs",
+      "require": "./dist/nitrobase/nitrobase.cjs"
+    },
+    "./nitrobase/client": {
+      "types": "./dist/nitrobase/client.d.ts",
+      "import": "./dist/nitrobase/client.mjs",
+      "require": "./dist/nitrobase/client.cjs"
     },
     "./flux": {
       "types": "./dist/flux.d.ts",
diff --git a/packages/alwatr/src/nitrobase/client.ts b/packages/alwatr/src/nitrobase/client.ts
new file mode 100644
index 000000000..57a0b71ce
--- /dev/null
+++ b/packages/alwatr/src/nitrobase/client.ts
@@ -0,0 +1 @@
+export * from '@alwatr/nitrobase/client';
diff --git a/packages/alwatr/src/nitrobase.ts b/packages/alwatr/src/nitrobase/nitrobase.ts
similarity index 100%
rename from packages/alwatr/src/nitrobase.ts
rename to packages/alwatr/src/nitrobase/nitrobase.ts