diff --git a/deno.json b/deno.json
index 20d87204..05ecb34a 100644
--- a/deno.json
+++ b/deno.json
@@ -10,7 +10,6 @@
     "./packages/nip98",
     "./packages/policies",
     "./packages/ratelimiter",
-    "./packages/router",
     "./packages/translators",
     "./packages/uploaders"
   ],
diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts
index 2b90f132..eab81b47 100644
--- a/packages/ditto/app.ts
+++ b/packages/ditto/app.ts
@@ -1,7 +1,7 @@
 import { DittoConf } from '@ditto/conf';
 import { DittoDB } from '@ditto/db';
 import { paginationMiddleware, tokenMiddleware, userMiddleware } from '@ditto/mastoapi/middleware';
-import { DittoApp, type DittoEnv } from '@ditto/router';
+import { DittoApp, type DittoEnv } from '@ditto/mastoapi/router';
 import { type DittoTranslator } from '@ditto/translators';
 import { type Context, Handler, Input as HonoInput, MiddlewareHandler } from '@hono/hono';
 import { every } from '@hono/hono/combine';
diff --git a/packages/ditto/controllers/api/cashu.test.ts b/packages/ditto/controllers/api/cashu.test.ts
index 22e9a38f..1b28d099 100644
--- a/packages/ditto/controllers/api/cashu.test.ts
+++ b/packages/ditto/controllers/api/cashu.test.ts
@@ -1,6 +1,6 @@
 import { DittoConf } from '@ditto/conf';
 import { type User } from '@ditto/mastoapi/middleware';
-import { DittoApp, DittoMiddleware } from '@ditto/router';
+import { DittoApp, DittoMiddleware } from '@ditto/mastoapi/router';
 import { NSecSigner } from '@nostrify/nostrify';
 import { genEvent } from '@nostrify/nostrify/test';
 import { bytesToString, stringToBytes } from '@scure/base';
diff --git a/packages/ditto/controllers/api/cashu.ts b/packages/ditto/controllers/api/cashu.ts
index bb39397c..a98a0309 100644
--- a/packages/ditto/controllers/api/cashu.ts
+++ b/packages/ditto/controllers/api/cashu.ts
@@ -1,6 +1,6 @@
 import { Proof } from '@cashu/cashu-ts';
 import { userMiddleware } from '@ditto/mastoapi/middleware';
-import { DittoRoute } from '@ditto/router';
+import { DittoRoute } from '@ditto/mastoapi/router';
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { bytesToString, stringToBytes } from '@scure/base';
 import { z } from 'zod';
diff --git a/packages/mastoapi/deno.json b/packages/mastoapi/deno.json
index ddeb175f..d98dbc91 100644
--- a/packages/mastoapi/deno.json
+++ b/packages/mastoapi/deno.json
@@ -3,6 +3,7 @@
   "version": "1.1.0",
   "exports": {
     "./middleware": "./middleware/mod.ts",
+    "./router": "./router/mod.ts",
     "./test": "./test.ts"
   }
 }
diff --git a/packages/mastoapi/middleware/paginationMiddleware.ts b/packages/mastoapi/middleware/paginationMiddleware.ts
index cca64229..28a7f1a1 100644
--- a/packages/mastoapi/middleware/paginationMiddleware.ts
+++ b/packages/mastoapi/middleware/paginationMiddleware.ts
@@ -1,7 +1,7 @@
 import { paginated, paginatedList } from '../pagination/paginate.ts';
 import { paginationSchema } from '../pagination/schema.ts';
 
-import type { DittoMiddleware } from '@ditto/router';
+import type { DittoMiddleware } from '@ditto/mastoapi/router';
 import type { NostrEvent } from '@nostrify/nostrify';
 
 interface Pagination {
diff --git a/packages/mastoapi/middleware/tokenMiddleware.ts b/packages/mastoapi/middleware/tokenMiddleware.ts
index d4f8a05b..a2241c19 100644
--- a/packages/mastoapi/middleware/tokenMiddleware.ts
+++ b/packages/mastoapi/middleware/tokenMiddleware.ts
@@ -9,7 +9,7 @@ import { ConnectSigner } from '../signers/ConnectSigner.ts';
 import { ReadOnlySigner } from '../signers/ReadOnlySigner.ts';
 import { UserStore } from '../storages/UserStore.ts';
 
-import type { DittoEnv, DittoMiddleware } from '@ditto/router';
+import type { DittoEnv, DittoMiddleware } from '@ditto/mastoapi/router';
 import type { Context } from '@hono/hono';
 import type { User } from './User.ts';
 
diff --git a/packages/mastoapi/middleware/userMiddleware.ts b/packages/mastoapi/middleware/userMiddleware.ts
index 8308172d..2b964362 100644
--- a/packages/mastoapi/middleware/userMiddleware.ts
+++ b/packages/mastoapi/middleware/userMiddleware.ts
@@ -1,7 +1,7 @@
 import { buildAuthEventTemplate, validateAuthEvent } from '@ditto/nip98';
 import { HTTPException } from '@hono/hono/http-exception';
 
-import type { DittoMiddleware } from '@ditto/router';
+import type { DittoMiddleware } from '@ditto/mastoapi/router';
 import type { NostrEvent, NostrSigner } from '@nostrify/nostrify';
 import type { SetRequired } from 'type-fest';
 import type { User } from './User.ts';
diff --git a/packages/router/DittoApp.test.ts b/packages/mastoapi/router/DittoApp.test.ts
similarity index 100%
rename from packages/router/DittoApp.test.ts
rename to packages/mastoapi/router/DittoApp.test.ts
diff --git a/packages/router/DittoApp.ts b/packages/mastoapi/router/DittoApp.ts
similarity index 100%
rename from packages/router/DittoApp.ts
rename to packages/mastoapi/router/DittoApp.ts
diff --git a/packages/router/DittoEnv.ts b/packages/mastoapi/router/DittoEnv.ts
similarity index 100%
rename from packages/router/DittoEnv.ts
rename to packages/mastoapi/router/DittoEnv.ts
diff --git a/packages/router/DittoMiddleware.ts b/packages/mastoapi/router/DittoMiddleware.ts
similarity index 100%
rename from packages/router/DittoMiddleware.ts
rename to packages/mastoapi/router/DittoMiddleware.ts
diff --git a/packages/router/DittoRoute.test.ts b/packages/mastoapi/router/DittoRoute.test.ts
similarity index 100%
rename from packages/router/DittoRoute.test.ts
rename to packages/mastoapi/router/DittoRoute.test.ts
diff --git a/packages/router/DittoRoute.ts b/packages/mastoapi/router/DittoRoute.ts
similarity index 100%
rename from packages/router/DittoRoute.ts
rename to packages/mastoapi/router/DittoRoute.ts
diff --git a/packages/router/mod.ts b/packages/mastoapi/router/mod.ts
similarity index 100%
rename from packages/router/mod.ts
rename to packages/mastoapi/router/mod.ts
diff --git a/packages/mastoapi/test.ts b/packages/mastoapi/test.ts
index 78753511..41e35c2c 100644
--- a/packages/mastoapi/test.ts
+++ b/packages/mastoapi/test.ts
@@ -1,6 +1,6 @@
 import { DittoConf } from '@ditto/conf';
 import { type DittoDB, DummyDB } from '@ditto/db';
-import { DittoApp, type DittoMiddleware } from '@ditto/router';
+import { DittoApp, type DittoMiddleware } from '@ditto/mastoapi/router';
 import { type NostrSigner, type NRelay, NSecSigner } from '@nostrify/nostrify';
 import { MockRelay } from '@nostrify/nostrify/test';
 import { generateSecretKey, nip19 } from 'nostr-tools';
diff --git a/packages/router/deno.json b/packages/router/deno.json
deleted file mode 100644
index 8321baaf..00000000
--- a/packages/router/deno.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "@ditto/router",
-  "version": "1.1.0",
-  "exports": {
-    ".": "./mod.ts"
-  }
-}