diff --git a/bun.lockb b/bun.lockb
index b4658ef1..43ffe1b5 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/cli.ts b/cli.ts
index abe3b56b..adcae235 100644
--- a/cli.ts
+++ b/cli.ts
@@ -20,8 +20,8 @@ import {
 } from "~database/entities/User";
 import { db } from "~drizzle/db";
 import { emoji, openIdAccount, status, user } from "~drizzle/schema";
-import { CliParameterType } from "~packages/cli-parser/cli-builder.type";
-import { config } from "~packages/config-manager";
+import { CliParameterType } from "cli-parser/cli-builder.type";
+import { config } from "config-manager";
 
 const args = process.argv;
 
diff --git a/drizzle/db.ts b/drizzle/db.ts
index 84a0874c..1a046e46 100644
--- a/drizzle/db.ts
+++ b/drizzle/db.ts
@@ -2,11 +2,7 @@ import { config } from "config-manager";
 import { drizzle } from "drizzle-orm/node-postgres";
 import { Client } from "pg";
 import * as schema from "./schema";
-import {
-    LogLevel,
-    type LogManager,
-    type MultiLogManager,
-} from "~packages/log-manager";
+import { LogLevel, type LogManager, type MultiLogManager } from "log-manager";
 import { migrate } from "drizzle-orm/postgres-js/migrator";
 
 export const client = new Client({
diff --git a/routes.ts b/routes.ts
index 5e5655cb..c8b8b47d 100644
--- a/routes.ts
+++ b/routes.ts
@@ -1,7 +1,3 @@
-import type { APIRouteExports } from "~packages/server-handler";
-import type { RouteHandler } from "./server/api/routes.type";
-import type { APIRouteMeta } from "./types/api";
-
 // Why are these routes specified manually instead of using Bun's FileSystemRouter?
 // This is to allow for compilation of the routes, so that we can minify them and
 // node_modules in production
@@ -103,7 +99,7 @@ export const routeMatcher = new Bun.FileSystemRouter({
     dir: `${process.cwd()}/server/api`,
 });
 
-export const matchRoute = async <T = Record<string, never>>(url: string) => {
+export const matchRoute = async (url: string) => {
     const route = routeMatcher.match(url);
     if (!route) return { file: null, matchedRoute: null };
 
diff --git a/server.ts b/server.ts
index 68360cff..8ebcd158 100644
--- a/server.ts
+++ b/server.ts
@@ -3,7 +3,7 @@ import type { Config } from "config-manager";
 import { matches } from "ip-matching";
 import type { LogManager, MultiLogManager } from "log-manager";
 import { LogLevel } from "log-manager";
-import { processRoute } from "~packages/server-handler";
+import { processRoute } from "server-handler";
 import { matchRoute } from "~routes";
 
 export const createServer = (
diff --git a/server/api/api/v1/media/[id]/index.ts b/server/api/api/v1/media/[id]/index.ts
index 43e54e06..5e997b4c 100644
--- a/server/api/api/v1/media/[id]/index.ts
+++ b/server/api/api/v1/media/[id]/index.ts
@@ -6,7 +6,7 @@ import { MediaBackendType } from "media-manager";
 import { attachmentToAPI, getUrl } from "~database/entities/Attachment";
 import { db } from "~drizzle/db";
 import { attachment } from "~drizzle/schema";
-import { LocalMediaBackend, S3MediaBackend } from "~packages/media-manager";
+import { LocalMediaBackend, S3MediaBackend } from "media-manager";
 
 export const meta = applyConfig({
     allowedMethods: ["GET", "PUT"],
diff --git a/server/api/api/v1/media/index.ts b/server/api/api/v1/media/index.ts
index b333ffa6..bf4415fc 100644
--- a/server/api/api/v1/media/index.ts
+++ b/server/api/api/v1/media/index.ts
@@ -7,7 +7,7 @@ import sharp from "sharp";
 import { attachmentToAPI, getUrl } from "~database/entities/Attachment";
 import { db } from "~drizzle/db";
 import { attachment } from "~drizzle/schema";
-import { LocalMediaBackend, S3MediaBackend } from "~packages/media-manager";
+import { LocalMediaBackend, S3MediaBackend } from "media-manager";
 
 export const meta = applyConfig({
     allowedMethods: ["POST"],
diff --git a/server/api/api/v2/media/index.ts b/server/api/api/v2/media/index.ts
index d649991c..0f7dbbd6 100644
--- a/server/api/api/v2/media/index.ts
+++ b/server/api/api/v2/media/index.ts
@@ -7,7 +7,7 @@ import sharp from "sharp";
 import { attachmentToAPI, getUrl } from "~database/entities/Attachment";
 import { db } from "~drizzle/db";
 import { attachment } from "~drizzle/schema";
-import { LocalMediaBackend, S3MediaBackend } from "~packages/media-manager";
+import { LocalMediaBackend, S3MediaBackend } from "media-manager";
 
 export const meta = applyConfig({
     allowedMethods: ["POST"],