diff --git a/packages/database-interface/main.ts b/packages/database-interface/main.ts
deleted file mode 100644
index 7dc857d8..00000000
--- a/packages/database-interface/main.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { Note } from "./note";
-import { OAuthManager } from "./oauth";
-import { Timeline } from "./timeline";
-
-export { Note, Timeline, OAuthManager };
diff --git a/packages/plugin-kit/exports/db.ts b/packages/plugin-kit/exports/db.ts
new file mode 100644
index 00000000..4385a008
--- /dev/null
+++ b/packages/plugin-kit/exports/db.ts
@@ -0,0 +1,9 @@
+// biome-ignore lint/performance/noBarrelFile: <explanation>
+export { User } from "~/packages/database-interface/user";
+export { Role } from "~/packages/database-interface/role";
+export { Attachment } from "~/packages/database-interface/attachment";
+export { Emoji } from "~/packages/database-interface/emoji";
+export { Instance } from "~/packages/database-interface/instance";
+export { Note } from "~/packages/database-interface/note";
+export { Timeline } from "~/packages/database-interface/timeline";
+export { db } from "~/drizzle/db";
diff --git a/packages/plugin-kit/exports/drizzle.ts b/packages/plugin-kit/exports/drizzle.ts
new file mode 100644
index 00000000..682cee64
--- /dev/null
+++ b/packages/plugin-kit/exports/drizzle.ts
@@ -0,0 +1,3 @@
+// biome-ignore lint/performance/noReExportAll: <explanation>
+// biome-ignore lint/performance/noBarrelFile: <explanation>
+export * from "drizzle-orm";
diff --git a/packages/plugin-kit/exports/tables.ts b/packages/plugin-kit/exports/tables.ts
new file mode 100644
index 00000000..1fe0b977
--- /dev/null
+++ b/packages/plugin-kit/exports/tables.ts
@@ -0,0 +1,3 @@
+// biome-ignore lint/performance/noReExportAll: <explanation>
+// biome-ignore lint/performance/noBarrelFile: <explanation>
+export * from "~/drizzle/schema";
diff --git a/packages/plugin-kit/package.json b/packages/plugin-kit/package.json
index 2d8a4abc..a015b2ea 100644
--- a/packages/plugin-kit/package.json
+++ b/packages/plugin-kit/package.json
@@ -37,6 +37,18 @@
         ".": {
             "import": "./index.ts",
             "default": "./index.ts"
+        },
+        "./db": {
+            "import": "./exports/db.ts",
+            "default": "./exports/db.ts"
+        },
+        "./drizzle": {
+            "import": "./exports/drizzle.ts",
+            "default": "./exports/drizzle.ts"
+        },
+        "./tables": {
+            "import": "./exports/tables.ts",
+            "default": "./exports/tables.ts"
         }
     }
 }
diff --git a/plugins/openid/routes/authorize.ts b/plugins/openid/routes/authorize.ts
index 78fc66a7..0220da68 100644
--- a/plugins/openid/routes/authorize.ts
+++ b/plugins/openid/routes/authorize.ts
@@ -1,11 +1,11 @@
 import { auth, jsonOrForm } from "@/api";
 import { randomString } from "@/math";
+import { db } from "@versia/kit/db";
+import { RolePermissions, Tokens } from "@versia/kit/tables";
 import { type JWTPayload, SignJWT, jwtVerify } from "jose";
 import { JOSEError } from "jose/errors";
 import { z } from "zod";
 import { TokenType } from "~/classes/functions/token";
-import { db } from "~/drizzle/db";
-import { RolePermissions, Tokens } from "~/drizzle/schema";
 import { User } from "~/packages/database-interface/user";
 import type { PluginType } from "../index";
 
diff --git a/plugins/openid/routes/oauth/revoke.ts b/plugins/openid/routes/oauth/revoke.ts
index 6bdae6dc..063b57e2 100644
--- a/plugins/openid/routes/oauth/revoke.ts
+++ b/plugins/openid/routes/oauth/revoke.ts
@@ -1,8 +1,8 @@
 import { jsonOrForm } from "@/api";
 import { createRoute, z } from "@hono/zod-openapi";
-import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Tokens } from "~/drizzle/schema";
+import { db } from "@versia/kit/db";
+import { eq } from "@versia/kit/drizzle";
+import { Tokens } from "@versia/kit/tables";
 import type { PluginType } from "../..";
 
 export const schemas = {
diff --git a/plugins/openid/routes/oauth/token.ts b/plugins/openid/routes/oauth/token.ts
index 63ddb380..57d00f0e 100644
--- a/plugins/openid/routes/oauth/token.ts
+++ b/plugins/openid/routes/oauth/token.ts
@@ -1,8 +1,8 @@
 import { jsonOrForm } from "@/api";
 import { createRoute, z } from "@hono/zod-openapi";
-import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Tokens } from "~/drizzle/schema";
+import { db } from "@versia/kit/db";
+import { eq } from "@versia/kit/drizzle";
+import { Tokens } from "@versia/kit/tables";
 import type { PluginType } from "../..";
 
 export const schemas = {
diff --git a/plugins/openid/routes/sso/:id/index.ts b/plugins/openid/routes/sso/:id/index.ts
index 6d4399f4..92f1aa9b 100644
--- a/plugins/openid/routes/sso/:id/index.ts
+++ b/plugins/openid/routes/sso/:id/index.ts
@@ -1,9 +1,9 @@
 import { auth } from "@/api";
 import { proxyUrl } from "@/response";
 import { createRoute, z } from "@hono/zod-openapi";
-import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { OpenIdAccounts, RolePermissions } from "~/drizzle/schema";
+import { db } from "@versia/kit/db";
+import { eq } from "@versia/kit/drizzle";
+import { OpenIdAccounts, RolePermissions } from "@versia/kit/tables";
 import type { PluginType } from "~/plugins/openid";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/plugins/openid/routes/sso/index.ts b/plugins/openid/routes/sso/index.ts
index 0c765a33..85d76494 100644
--- a/plugins/openid/routes/sso/index.ts
+++ b/plugins/openid/routes/sso/index.ts
@@ -1,15 +1,15 @@
 import { auth } from "@/api";
+import { db } from "@versia/kit/db";
+import {
+    Applications,
+    OpenIdLoginFlows,
+    RolePermissions,
+} from "@versia/kit/tables";
 import {
     calculatePKCECodeChallenge,
     generateRandomCodeVerifier,
 } from "oauth4webapi";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import {
-    Applications,
-    OpenIdLoginFlows,
-    RolePermissions,
-} from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 import type { PluginType } from "../..";
 import { oauthDiscoveryRequest, oauthRedirectUri } from "../../utils";