diff --git a/src/app.ts b/src/app.ts
index ba7f873..537f563 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -6,13 +6,13 @@ import {
   accountSearchController,
   credentialsController,
   relationshipsController,
-} from './api/accounts.ts';
-import { appCredentialsController, createAppController } from './api/apps.ts';
-import { emptyArrayController, emptyObjectController } from './api/fallback.ts';
-import { homeController } from './api/timelines.ts';
-import instanceController from './api/instance.ts';
-import { createTokenController, oauthAuthorizeController, oauthController } from './api/oauth.ts';
-import { contextController, createStatusController, statusController } from './api/statuses.ts';
+} from './controllers/api/accounts.ts';
+import { appCredentialsController, createAppController } from './controllers/api/apps.ts';
+import { emptyArrayController, emptyObjectController } from './controllers/api/fallback.ts';
+import { homeController } from './controllers/api/timelines.ts';
+import instanceController from './controllers/api/instance.ts';
+import { createTokenController, oauthAuthorizeController, oauthController } from './controllers/api/oauth.ts';
+import { contextController, createStatusController, statusController } from './controllers/api/statuses.ts';
 import { requireAuth, setAuth } from './middleware/auth.ts';
 
 interface AppEnv extends HonoEnv {
diff --git a/src/api/accounts.ts b/src/controllers/api/accounts.ts
similarity index 92%
rename from src/api/accounts.ts
rename to src/controllers/api/accounts.ts
index cc889b9..cc4d5c5 100644
--- a/src/api/accounts.ts
+++ b/src/controllers/api/accounts.ts
@@ -1,11 +1,10 @@
 import { type AppController } from '@/app.ts';
 import { nip05 } from '@/deps.ts';
+import { getAuthor } from '@/client.ts';
+import { toAccount } from '@/transmute.ts';
+import { bech32ToPubkey } from '@/utils.ts';
 
-import { getAuthor } from '../client.ts';
-import { toAccount } from '../transmute.ts';
-import { bech32ToPubkey } from '../utils.ts';
-
-import type { Event } from '../event.ts';
+import type { Event } from '@/event.ts';
 
 const credentialsController: AppController = async (c) => {
   const pubkey = c.get('pubkey')!;
diff --git a/src/api/apps.ts b/src/controllers/api/apps.ts
similarity index 100%
rename from src/api/apps.ts
rename to src/controllers/api/apps.ts
diff --git a/src/api/fallback.ts b/src/controllers/api/fallback.ts
similarity index 100%
rename from src/api/fallback.ts
rename to src/controllers/api/fallback.ts
diff --git a/src/api/instance.ts b/src/controllers/api/instance.ts
similarity index 100%
rename from src/api/instance.ts
rename to src/controllers/api/instance.ts
diff --git a/src/api/oauth.ts b/src/controllers/api/oauth.ts
similarity index 100%
rename from src/api/oauth.ts
rename to src/controllers/api/oauth.ts
diff --git a/src/api/statuses.ts b/src/controllers/api/statuses.ts
similarity index 91%
rename from src/api/statuses.ts
rename to src/controllers/api/statuses.ts
index 45696cc..eda8234 100644
--- a/src/api/statuses.ts
+++ b/src/controllers/api/statuses.ts
@@ -1,11 +1,10 @@
 import { type AppContext, AppController } from '@/app.ts';
+import { getAncestors, getDescendants, getEvent } from '@/client.ts';
 import { validator, z } from '@/deps.ts';
 import { type Event } from '@/event.ts';
+import publish from '@/publisher.ts';
 import { signEvent } from '@/sign.ts';
-
-import { getAncestors, getDescendants, getEvent } from '../client.ts';
-import publish from '../publisher.ts';
-import { toStatus } from '../transmute.ts';
+import { toStatus } from '@/transmute.ts';
 
 const createStatusSchema = z.object({
   status: z.string(),
diff --git a/src/api/timelines.ts b/src/controllers/api/timelines.ts
similarity index 86%
rename from src/api/timelines.ts
rename to src/controllers/api/timelines.ts
index 7eaab72..0264d83 100644
--- a/src/api/timelines.ts
+++ b/src/controllers/api/timelines.ts
@@ -1,10 +1,8 @@
 import { type AppController } from '@/app.ts';
+import { getFeed, getFollows } from '@/client.ts';
+import { LOCAL_DOMAIN } from '@/config.ts';
 import { z } from '@/deps.ts';
-
-import { getFeed, getFollows } from '../client.ts';
-import { toStatus } from '../transmute.ts';
-
-import { LOCAL_DOMAIN } from '../config.ts';
+import { toStatus } from '@/transmute.ts';
 
 const homeController: AppController = async (c) => {
   const since = paramSchema.parse(c.req.query('since'));