diff --git a/api/api/auth/login/index.ts b/api/api/auth/login/index.ts
index 6951db26..4b1b8d76 100644
--- a/api/api/auth/login/index.ts
+++ b/api/api/auth/login/index.ts
@@ -3,10 +3,10 @@ import type { Context } from "@hono/hono";
 import { setCookie } from "@hono/hono/cookie";
 import { createRoute } from "@hono/zod-openapi";
 import { Application, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq, or } from "drizzle-orm";
 import { SignJWT } from "jose";
 import { z } from "zod";
-import { Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export const meta = applyConfig({
diff --git a/api/api/auth/redirect/index.ts b/api/api/auth/redirect/index.ts
index 54d98488..a0423a73 100644
--- a/api/api/auth/redirect/index.ts
+++ b/api/api/auth/redirect/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { Applications, Tokens } from "@versia/kit/tables";
 import { and, eq } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Applications, Tokens } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export const meta = applyConfig({
diff --git a/api/api/auth/reset/index.ts b/api/api/auth/reset/index.ts
index 3882ea9e..70a01fbc 100644
--- a/api/api/auth/reset/index.ts
+++ b/api/api/auth/reset/index.ts
@@ -1,10 +1,10 @@
 import { apiRoute, applyConfig } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
 import type { Context } from "hono";
 import { z } from "zod";
-import { Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/block.ts b/api/api/v1/accounts/:id/block.ts
index 7b5fb923..3b1af76f 100644
--- a/api/api/v1/accounts/:id/block.ts
+++ b/api/api/v1/accounts/:id/block.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/follow.ts b/api/api/v1/accounts/:id/follow.ts
index 72515626..2f5953c7 100644
--- a/api/api/v1/accounts/:id/follow.ts
+++ b/api/api/v1/accounts/:id/follow.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/followers.ts b/api/api/v1/accounts/:id/followers.ts
index 00cf0c64..9cd05260 100644
--- a/api/api/v1/accounts/:id/followers.ts
+++ b/api/api/v1/accounts/:id/followers.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/following.ts b/api/api/v1/accounts/:id/following.ts
index b3c859b2..02a83174 100644
--- a/api/api/v1/accounts/:id/following.ts
+++ b/api/api/v1/accounts/:id/following.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/index.ts b/api/api/v1/accounts/:id/index.ts
index 942a2009..005332ed 100644
--- a/api/api/v1/accounts/:id/index.ts
+++ b/api/api/v1/accounts/:id/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/mute.ts b/api/api/v1/accounts/:id/mute.ts
index 49d27d22..fe224ed6 100644
--- a/api/api/v1/accounts/:id/mute.ts
+++ b/api/api/v1/accounts/:id/mute.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/note.ts b/api/api/v1/accounts/:id/note.ts
index 344c42c2..17570213 100644
--- a/api/api/v1/accounts/:id/note.ts
+++ b/api/api/v1/accounts/:id/note.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/pin.ts b/api/api/v1/accounts/:id/pin.ts
index 5a9a6670..3dba343f 100644
--- a/api/api/v1/accounts/:id/pin.ts
+++ b/api/api/v1/accounts/:id/pin.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/refetch.ts b/api/api/v1/accounts/:id/refetch.ts
index ff2b793b..522952c3 100644
--- a/api/api/v1/accounts/:id/refetch.ts
+++ b/api/api/v1/accounts/:id/refetch.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/remove_from_followers.ts b/api/api/v1/accounts/:id/remove_from_followers.ts
index 6249ac46..2b5deb3f 100644
--- a/api/api/v1/accounts/:id/remove_from_followers.ts
+++ b/api/api/v1/accounts/:id/remove_from_followers.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/statuses.ts b/api/api/v1/accounts/:id/statuses.ts
index 219cfbca..483ab0a3 100644
--- a/api/api/v1/accounts/:id/statuses.ts
+++ b/api/api/v1/accounts/:id/statuses.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline, User } from "@versia/kit/db";
+import { Notes, RolePermissions } from "@versia/kit/tables";
 import { and, eq, gt, gte, isNull, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { Notes, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/unblock.ts b/api/api/v1/accounts/:id/unblock.ts
index 0b36e434..a6f632ed 100644
--- a/api/api/v1/accounts/:id/unblock.ts
+++ b/api/api/v1/accounts/:id/unblock.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/unfollow.ts b/api/api/v1/accounts/:id/unfollow.ts
index 374e06c5..af998713 100644
--- a/api/api/v1/accounts/:id/unfollow.ts
+++ b/api/api/v1/accounts/:id/unfollow.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/unmute.ts b/api/api/v1/accounts/:id/unmute.ts
index 7db0da5b..388bf8b2 100644
--- a/api/api/v1/accounts/:id/unmute.ts
+++ b/api/api/v1/accounts/:id/unmute.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/:id/unpin.ts b/api/api/v1/accounts/:id/unpin.ts
index c5911dee..d5215798 100644
--- a/api/api/v1/accounts/:id/unpin.ts
+++ b/api/api/v1/accounts/:id/unpin.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/familiar_followers/index.ts b/api/api/v1/accounts/familiar_followers/index.ts
index ce777219..953edd36 100644
--- a/api/api/v1/accounts/familiar_followers/index.ts
+++ b/api/api/v1/accounts/familiar_followers/index.ts
@@ -1,10 +1,9 @@
 import { apiRoute, applyConfig, auth, qsQuery } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
-import { User } from "@versia/kit/db";
+import { User, db } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/id/index.ts b/api/api/v1/accounts/id/index.ts
index 0732c8fa..2aea6198 100644
--- a/api/api/v1/accounts/id/index.ts
+++ b/api/api/v1/accounts/id/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/index.test.ts b/api/api/v1/accounts/index.test.ts
index c8c38dee..a715f765 100644
--- a/api/api/v1/accounts/index.test.ts
+++ b/api/api/v1/accounts/index.test.ts
@@ -1,8 +1,8 @@
 import { afterEach, describe, expect, test } from "bun:test";
 import { randomString } from "@/math";
+import { db } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Users } from "~/drizzle/schema";
 import { fakeRequest, getSolvedChallenge } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/accounts/index.ts b/api/api/v1/accounts/index.ts
index b496aa38..50fe9e59 100644
--- a/api/api/v1/accounts/index.ts
+++ b/api/api/v1/accounts/index.ts
@@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { tempmailDomains } from "@/tempmail";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
-import { Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/lookup/index.ts b/api/api/v1/accounts/lookup/index.ts
index 801067a6..cc2b047d 100644
--- a/api/api/v1/accounts/lookup/index.ts
+++ b/api/api/v1/accounts/lookup/index.ts
@@ -1,6 +1,7 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
 import {
     anyOf,
@@ -14,7 +15,6 @@ import {
     oneOrMore,
 } from "magic-regexp";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/relationships/index.test.ts b/api/api/v1/accounts/relationships/index.test.ts
index 5c50f3df..6967c36e 100644
--- a/api/api/v1/accounts/relationships/index.test.ts
+++ b/api/api/v1/accounts/relationships/index.test.ts
@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { db } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Users } from "~/drizzle/schema";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/accounts/relationships/index.ts b/api/api/v1/accounts/relationships/index.ts
index da97d108..fb150c2c 100644
--- a/api/api/v1/accounts/relationships/index.ts
+++ b/api/api/v1/accounts/relationships/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth, qsQuery } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/search/index.ts b/api/api/v1/accounts/search/index.ts
index b63304e1..6d6cd119 100644
--- a/api/api/v1/accounts/search/index.ts
+++ b/api/api/v1/accounts/search/index.ts
@@ -1,6 +1,7 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { eq, ilike, not, or, sql } from "drizzle-orm";
 import {
     anyOf,
@@ -15,7 +16,6 @@ import {
 } from "magic-regexp";
 import stringComparison from "string-comparison";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/accounts/update_credentials/index.ts b/api/api/v1/accounts/update_credentials/index.ts
index 5ca64a51..6481700c 100644
--- a/api/api/v1/accounts/update_credentials/index.ts
+++ b/api/api/v1/accounts/update_credentials/index.ts
@@ -1,14 +1,13 @@
 import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { sanitizedHtmlStrip } from "@/sanitization";
 import { createRoute } from "@hono/zod-openapi";
-import { Attachment, Emoji, User } from "@versia/kit/db";
+import { Attachment, Emoji, User, db } from "@versia/kit/db";
+import { EmojiToUser, RolePermissions, Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
 import { contentToHtml } from "~/classes/functions/status";
 import { MediaManager } from "~/classes/media/media-manager";
-import { db } from "~/drizzle/db";
-import { EmojiToUser, RolePermissions, Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/apps/index.ts b/api/api/v1/apps/index.ts
index 1cee4907..5006c293 100644
--- a/api/api/v1/apps/index.ts
+++ b/api/api/v1/apps/index.ts
@@ -2,8 +2,8 @@ import { apiRoute, applyConfig, jsonOrForm } from "@/api";
 import { randomString } from "@/math";
 import { createRoute } from "@hono/zod-openapi";
 import { Application } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 
 export const meta = applyConfig({
     route: "/api/v1/apps",
diff --git a/api/api/v1/apps/verify_credentials/index.ts b/api/api/v1/apps/verify_credentials/index.ts
index 242f07c1..de44cf3d 100644
--- a/api/api/v1/apps/verify_credentials/index.ts
+++ b/api/api/v1/apps/verify_credentials/index.ts
@@ -1,7 +1,7 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Application } from "@versia/kit/db";
-import { RolePermissions } from "~/drizzle/schema";
+import { RolePermissions } from "@versia/kit/tables";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/blocks/index.ts b/api/api/v1/blocks/index.ts
index bc36884a..83e36476 100644
--- a/api/api/v1/blocks/index.ts
+++ b/api/api/v1/blocks/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/custom_emojis/index.test.ts b/api/api/v1/custom_emojis/index.test.ts
index e11fa3e3..187efdf6 100644
--- a/api/api/v1/custom_emojis/index.test.ts
+++ b/api/api/v1/custom_emojis/index.test.ts
@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Emojis } from "~/drizzle/schema";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/custom_emojis/index.ts b/api/api/v1/custom_emojis/index.ts
index 534c38c6..6457fec9 100644
--- a/api/api/v1/custom_emojis/index.ts
+++ b/api/api/v1/custom_emojis/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute, z } from "@hono/zod-openapi";
 import { Emoji } from "@versia/kit/db";
+import { Emojis, RolePermissions } from "@versia/kit/tables";
 import { and, eq, isNull, or } from "drizzle-orm";
-import { Emojis, RolePermissions } from "~/drizzle/schema";
 
 export const meta = applyConfig({
     route: "/api/v1/custom_emojis",
diff --git a/api/api/v1/emojis/:id/index.test.ts b/api/api/v1/emojis/:id/index.test.ts
index 3121284c..0fbb3b5f 100644
--- a/api/api/v1/emojis/:id/index.test.ts
+++ b/api/api/v1/emojis/:id/index.test.ts
@@ -1,7 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Emojis } from "~/drizzle/schema";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts
index 879999b0..67ecdde0 100644
--- a/api/api/v1/emojis/:id/index.ts
+++ b/api/api/v1/emojis/:id/index.ts
@@ -1,12 +1,11 @@
 import { apiRoute, applyConfig, auth, emojiValidator, jsonOrForm } from "@/api";
 import { mimeLookup } from "@/content_types";
 import { createRoute } from "@hono/zod-openapi";
-import { Attachment, Emoji } from "@versia/kit/db";
+import { Attachment, Emoji, db } from "@versia/kit/db";
+import { Emojis, RolePermissions } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
-import { db } from "~/drizzle/db";
-import { Emojis, RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/emojis/index.test.ts b/api/api/v1/emojis/index.test.ts
index 417f87c5..3f4b6e29 100644
--- a/api/api/v1/emojis/index.test.ts
+++ b/api/api/v1/emojis/index.test.ts
@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
 import sharp from "sharp";
-import { db } from "~/drizzle/db";
-import { Emojis } from "~/drizzle/schema";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/emojis/index.ts b/api/api/v1/emojis/index.ts
index 03249f80..6098b562 100644
--- a/api/api/v1/emojis/index.ts
+++ b/api/api/v1/emojis/index.ts
@@ -2,10 +2,10 @@ import { apiRoute, applyConfig, auth, emojiValidator, jsonOrForm } from "@/api";
 import { mimeLookup } from "@/content_types";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment, Emoji } from "@versia/kit/db";
+import { Emojis, RolePermissions } from "@versia/kit/tables";
 import { and, eq, isNull, or } from "drizzle-orm";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
-import { Emojis, RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/favourites/index.ts b/api/api/v1/favourites/index.ts
index ed4d9e39..746d13d5 100644
--- a/api/api/v1/favourites/index.ts
+++ b/api/api/v1/favourites/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline } from "@versia/kit/db";
+import { Notes, RolePermissions } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { Notes, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/follow_requests/:account_id/authorize.ts b/api/api/v1/follow_requests/:account_id/authorize.ts
index 19831c52..fc3d698a 100644
--- a/api/api/v1/follow_requests/:account_id/authorize.ts
+++ b/api/api/v1/follow_requests/:account_id/authorize.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/follow_requests/:account_id/reject.ts b/api/api/v1/follow_requests/:account_id/reject.ts
index c330236a..37539ad8 100644
--- a/api/api/v1/follow_requests/:account_id/reject.ts
+++ b/api/api/v1/follow_requests/:account_id/reject.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Relationship, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/follow_requests/index.ts b/api/api/v1/follow_requests/index.ts
index ec71c2be..0dbf78ba 100644
--- a/api/api/v1/follow_requests/index.ts
+++ b/api/api/v1/follow_requests/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/instance/index.ts b/api/api/v1/instance/index.ts
index 7a2cf0c2..2bf8a212 100644
--- a/api/api/v1/instance/index.ts
+++ b/api/api/v1/instance/index.ts
@@ -2,8 +2,8 @@ import { apiRoute, applyConfig, auth } from "@/api";
 import { proxyUrl } from "@/response";
 import { createRoute, z } from "@hono/zod-openapi";
 import { Instance, Note, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { Users } from "~/drizzle/schema";
 import manifest from "~/package.json";
 import { config } from "~/packages/config-manager";
 
diff --git a/api/api/v1/markers/index.ts b/api/api/v1/markers/index.ts
index d5430b9a..4f187389 100644
--- a/api/api/v1/markers/index.ts
+++ b/api/api/v1/markers/index.ts
@@ -1,10 +1,10 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import type { Marker as ApiMarker } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Markers, RolePermissions } from "@versia/kit/tables";
 import { and, eq } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Markers, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/media/:id/index.ts b/api/api/v1/media/:id/index.ts
index 4bdbda78..f17f7492 100644
--- a/api/api/v1/media/:id/index.ts
+++ b/api/api/v1/media/:id/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
-import { RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/media/index.ts b/api/api/v1/media/index.ts
index 8ea1f197..d053eaea 100644
--- a/api/api/v1/media/index.ts
+++ b/api/api/v1/media/index.ts
@@ -1,10 +1,10 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import sharp from "sharp";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
-import { RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/mutes/index.ts b/api/api/v1/mutes/index.ts
index 196df1cc..a1ce13f3 100644
--- a/api/api/v1/mutes/index.ts
+++ b/api/api/v1/mutes/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/notifications/:id/dismiss.ts b/api/api/v1/notifications/:id/dismiss.ts
index 5c5db671..66ff9319 100644
--- a/api/api/v1/notifications/:id/dismiss.ts
+++ b/api/api/v1/notifications/:id/dismiss.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { Notifications, RolePermissions } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Notifications, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/notifications/:id/index.ts b/api/api/v1/notifications/:id/index.ts
index 7bafe765..10739d5b 100644
--- a/api/api/v1/notifications/:id/index.ts
+++ b/api/api/v1/notifications/:id/index.ts
@@ -1,12 +1,12 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
 import {
     findManyNotifications,
     notificationToApi,
 } from "~/classes/functions/notification";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/notifications/clear/index.ts b/api/api/v1/notifications/clear/index.ts
index 7f2f6414..03b0be84 100644
--- a/api/api/v1/notifications/clear/index.ts
+++ b/api/api/v1/notifications/clear/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { Notifications, RolePermissions } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Notifications, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/notifications/destroy_multiple/index.ts b/api/api/v1/notifications/destroy_multiple/index.ts
index ea8aa387..e73c2005 100644
--- a/api/api/v1/notifications/destroy_multiple/index.ts
+++ b/api/api/v1/notifications/destroy_multiple/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { Notifications, RolePermissions } from "@versia/kit/tables";
 import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Notifications, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/notifications/index.ts b/api/api/v1/notifications/index.ts
index 3cba5845..0c498327 100644
--- a/api/api/v1/notifications/index.ts
+++ b/api/api/v1/notifications/index.ts
@@ -2,6 +2,7 @@ import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { fetchTimeline } from "@/timelines";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, User } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { sql } from "drizzle-orm";
 import { z } from "zod";
 import {
@@ -9,7 +10,6 @@ import {
     notificationToApi,
 } from "~/classes/functions/notification";
 import type { NotificationWithRelations } from "~/classes/functions/notification";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/profile/avatar.ts b/api/api/v1/profile/avatar.ts
index 78bfec49..0f938b84 100644
--- a/api/api/v1/profile/avatar.ts
+++ b/api/api/v1/profile/avatar.ts
@@ -1,7 +1,7 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
-import { RolePermissions } from "~/drizzle/schema";
+import { RolePermissions } from "@versia/kit/tables";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/profile/header.ts b/api/api/v1/profile/header.ts
index f417ef5b..afb6196a 100644
--- a/api/api/v1/profile/header.ts
+++ b/api/api/v1/profile/header.ts
@@ -1,7 +1,7 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
-import { RolePermissions } from "~/drizzle/schema";
+import { RolePermissions } from "@versia/kit/tables";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/roles/:id/index.test.ts b/api/api/v1/roles/:id/index.test.ts
index 7f09da47..707bf8d4 100644
--- a/api/api/v1/roles/:id/index.test.ts
+++ b/api/api/v1/roles/:id/index.test.ts
@@ -1,6 +1,10 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { Role } from "@versia/kit/db";
-import { ADMIN_ROLES, DEFAULT_ROLES, RolePermissions } from "~/drizzle/schema";
+import {
+    ADMIN_ROLES,
+    DEFAULT_ROLES,
+    RolePermissions,
+} from "@versia/kit/tables";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
 
diff --git a/api/api/v1/roles/:id/index.ts b/api/api/v1/roles/:id/index.ts
index bf4a9f1e..aa94ed1e 100644
--- a/api/api/v1/roles/:id/index.ts
+++ b/api/api/v1/roles/:id/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Role } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/roles/index.test.ts b/api/api/v1/roles/index.test.ts
index 84085df7..e8f1d0e3 100644
--- a/api/api/v1/roles/index.test.ts
+++ b/api/api/v1/roles/index.test.ts
@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { Role } from "@versia/kit/db";
-import { ADMIN_ROLES } from "~/drizzle/schema";
+import { ADMIN_ROLES } from "@versia/kit/tables";
 import { config } from "~/packages/config-manager/index.ts";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
diff --git a/api/api/v1/statuses/:id/context.ts b/api/api/v1/statuses/:id/context.ts
index 411c7f34..e8149c84 100644
--- a/api/api/v1/statuses/:id/context.ts
+++ b/api/api/v1/statuses/:id/context.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/favourite.ts b/api/api/v1/statuses/:id/favourite.ts
index 5c6fd74b..06fb02a9 100644
--- a/api/api/v1/statuses/:id/favourite.ts
+++ b/api/api/v1/statuses/:id/favourite.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/favourited_by.ts b/api/api/v1/statuses/:id/favourited_by.ts
index 15e6d908..ff300473 100644
--- a/api/api/v1/statuses/:id/favourited_by.ts
+++ b/api/api/v1/statuses/:id/favourited_by.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/index.ts b/api/api/v1/statuses/:id/index.ts
index 16f0aa9a..b6f2b73f 100644
--- a/api/api/v1/statuses/:id/index.ts
+++ b/api/api/v1/statuses/:id/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator, jsonOrForm } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment, Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/statuses/:id/pin.ts b/api/api/v1/statuses/:id/pin.ts
index 4d617749..0c923993 100644
--- a/api/api/v1/statuses/:id/pin.ts
+++ b/api/api/v1/statuses/:id/pin.ts
@@ -1,9 +1,8 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
-import { Note } from "@versia/kit/db";
+import { Note, db } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/reblog.ts b/api/api/v1/statuses/:id/reblog.ts
index 2d092349..1d6bca26 100644
--- a/api/api/v1/statuses/:id/reblog.ts
+++ b/api/api/v1/statuses/:id/reblog.ts
@@ -1,10 +1,9 @@
 import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
-import { Note } from "@versia/kit/db";
+import { Note, db } from "@versia/kit/db";
+import { Notes, Notifications, RolePermissions } from "@versia/kit/tables";
 import { and, eq } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Notes, Notifications, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/reblogged_by.ts b/api/api/v1/statuses/:id/reblogged_by.ts
index f65e335b..e6fc9d87 100644
--- a/api/api/v1/statuses/:id/reblogged_by.ts
+++ b/api/api/v1/statuses/:id/reblogged_by.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline, User } from "@versia/kit/db";
+import { RolePermissions, Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { RolePermissions, Users } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/source.ts b/api/api/v1/statuses/:id/source.ts
index 0f4ad83c..709a1d67 100644
--- a/api/api/v1/statuses/:id/source.ts
+++ b/api/api/v1/statuses/:id/source.ts
@@ -2,8 +2,8 @@ import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import type { StatusSource as ApiStatusSource } from "@versia/client/types";
 import { Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/unfavourite.ts b/api/api/v1/statuses/:id/unfavourite.ts
index 226a6bee..fe06058a 100644
--- a/api/api/v1/statuses/:id/unfavourite.ts
+++ b/api/api/v1/statuses/:id/unfavourite.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/unpin.ts b/api/api/v1/statuses/:id/unpin.ts
index 5fa45980..e609d5b8 100644
--- a/api/api/v1/statuses/:id/unpin.ts
+++ b/api/api/v1/statuses/:id/unpin.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/:id/unreblog.ts b/api/api/v1/statuses/:id/unreblog.ts
index 71061b53..4a359b71 100644
--- a/api/api/v1/statuses/:id/unreblog.ts
+++ b/api/api/v1/statuses/:id/unreblog.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note } from "@versia/kit/db";
+import { Notes, RolePermissions } from "@versia/kit/tables";
 import { and, eq } from "drizzle-orm";
 import { z } from "zod";
-import { Notes, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/statuses/index.test.ts b/api/api/v1/statuses/index.test.ts
index 74edbcc7..b19e373a 100644
--- a/api/api/v1/statuses/index.test.ts
+++ b/api/api/v1/statuses/index.test.ts
@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { Status as ApiStatus } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Emojis } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
 import { meta } from "./index.ts";
diff --git a/api/api/v1/statuses/index.ts b/api/api/v1/statuses/index.ts
index d59a6281..776b228b 100644
--- a/api/api/v1/statuses/index.ts
+++ b/api/api/v1/statuses/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment, Note } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
-import { RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v1/timelines/home.ts b/api/api/v1/timelines/home.ts
index 6c4da4b2..e1d5b687 100644
--- a/api/api/v1/timelines/home.ts
+++ b/api/api/v1/timelines/home.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline } from "@versia/kit/db";
+import { Notes, RolePermissions } from "@versia/kit/tables";
 import { and, eq, gt, gte, lt, or, sql } from "drizzle-orm";
 import { z } from "zod";
-import { Notes, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v1/timelines/public.ts b/api/api/v1/timelines/public.ts
index 695244b1..189c81d0 100644
--- a/api/api/v1/timelines/public.ts
+++ b/api/api/v1/timelines/public.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, idValidator } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Note, Timeline } from "@versia/kit/db";
+import { Notes, RolePermissions } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
 import { z } from "zod";
-import { Notes, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v2/filters/:id/index.ts b/api/api/v2/filters/:id/index.ts
index d1397a9c..1bc63ff8 100644
--- a/api/api/v2/filters/:id/index.ts
+++ b/api/api/v2/filters/:id/index.ts
@@ -1,9 +1,9 @@
 import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { FilterKeywords, Filters, RolePermissions } from "@versia/kit/tables";
 import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { FilterKeywords, Filters, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 
 export const meta = applyConfig({
diff --git a/api/api/v2/filters/index.ts b/api/api/v2/filters/index.ts
index 33908a0e..7526c01e 100644
--- a/api/api/v2/filters/index.ts
+++ b/api/api/v2/filters/index.ts
@@ -1,8 +1,8 @@
 import { apiRoute, applyConfig, auth, jsonOrForm } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
+import { db } from "@versia/kit/db";
+import { FilterKeywords, Filters, RolePermissions } from "@versia/kit/tables";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { FilterKeywords, Filters, RolePermissions } from "~/drizzle/schema";
 import { ErrorSchema } from "~/types/api";
 export const meta = applyConfig({
     route: "/api/v2/filters",
diff --git a/api/api/v2/instance/index.ts b/api/api/v2/instance/index.ts
index 576d92d4..bc6fe196 100644
--- a/api/api/v2/instance/index.ts
+++ b/api/api/v2/instance/index.ts
@@ -2,8 +2,8 @@ import { apiRoute, applyConfig } from "@/api";
 import { proxyUrl } from "@/response";
 import { createRoute, z } from "@hono/zod-openapi";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { Users } from "~/drizzle/schema";
 import manifest from "~/package.json";
 import { config } from "~/packages/config-manager";
 
diff --git a/api/api/v2/media/index.ts b/api/api/v2/media/index.ts
index d0b3748f..d384b623 100644
--- a/api/api/v2/media/index.ts
+++ b/api/api/v2/media/index.ts
@@ -1,10 +1,10 @@
 import { apiRoute, applyConfig, auth } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
 import { Attachment } from "@versia/kit/db";
+import { RolePermissions } from "@versia/kit/tables";
 import sharp from "sharp";
 import { z } from "zod";
 import { MediaManager } from "~/classes/media/media-manager";
-import { RolePermissions } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/api/v2/search/index.ts b/api/api/v2/search/index.ts
index 8ffe1071..be330c7b 100644
--- a/api/api/v2/search/index.ts
+++ b/api/api/v2/search/index.ts
@@ -6,12 +6,11 @@ import {
     userAddressValidator,
 } from "@/api";
 import { createRoute } from "@hono/zod-openapi";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
+import { Instances, Notes, RolePermissions, Users } from "@versia/kit/tables";
 import { and, eq, inArray, sql } from "drizzle-orm";
 import { z } from "zod";
 import { searchManager } from "~/classes/search/search-manager";
-import { db } from "~/drizzle/db";
-import { Instances, Notes, RolePermissions, Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/objects/:id/index.ts b/api/objects/:id/index.ts
index 8fd982a1..e454069c 100644
--- a/api/objects/:id/index.ts
+++ b/api/objects/:id/index.ts
@@ -5,9 +5,9 @@ import {
     Note as NoteSchema,
 } from "@versia/federation/schemas";
 import { Like, Note, User } from "@versia/kit/db";
+import { Likes, Notes } from "@versia/kit/tables";
 import { and, eq, inArray, sql } from "drizzle-orm";
 import { z } from "zod";
-import { Likes, Notes } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema, type KnownEntity } from "~/types/api";
 
diff --git a/api/users/:uuid/outbox/index.ts b/api/users/:uuid/outbox/index.ts
index 3fc52a55..5bc1eb0c 100644
--- a/api/users/:uuid/outbox/index.ts
+++ b/api/users/:uuid/outbox/index.ts
@@ -4,11 +4,10 @@ import {
     Collection as CollectionSchema,
     Note as NoteSchema,
 } from "@versia/federation/schemas";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
+import { Notes } from "@versia/kit/tables";
 import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Notes } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/api/well-known/versia.ts b/api/well-known/versia.ts
index 37da4eb6..dca0d16f 100644
--- a/api/well-known/versia.ts
+++ b/api/well-known/versia.ts
@@ -3,8 +3,8 @@ import { urlToContentFormat } from "@/content_types";
 import { createRoute } from "@hono/zod-openapi";
 import { InstanceMetadata as InstanceMetadataSchema } from "@versia/federation/schemas";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { asc } from "drizzle-orm";
-import { Users } from "~/drizzle/schema";
 import pkg from "~/package.json";
 import { config } from "~/packages/config-manager";
 
diff --git a/api/well-known/webfinger/index.ts b/api/well-known/webfinger/index.ts
index e3a75d32..6907fee3 100644
--- a/api/well-known/webfinger/index.ts
+++ b/api/well-known/webfinger/index.ts
@@ -4,10 +4,10 @@ import { getLogger } from "@logtape/logtape";
 import type { ResponseError } from "@versia/federation";
 import { WebFinger } from "@versia/federation/schemas";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
 import { lookup } from "mime-types";
 import { z } from "zod";
-import { Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { ErrorSchema } from "~/types/api";
 
diff --git a/classes/database/application.ts b/classes/database/application.ts
index 5ef0c691..0cebc54d 100644
--- a/classes/database/application.ts
+++ b/classes/database/application.ts
@@ -1,4 +1,6 @@
 import type { Application as APIApplication } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Applications } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -8,8 +10,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Applications } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 
 export type ApplicationType = InferSelectModel<typeof Applications>;
diff --git a/classes/database/attachment.ts b/classes/database/attachment.ts
index e089d16c..bedd6c5f 100644
--- a/classes/database/attachment.ts
+++ b/classes/database/attachment.ts
@@ -1,6 +1,8 @@
 import { proxyUrl } from "@/response";
 import type { Attachment as ApiAttachment } from "@versia/client/types";
 import type { ContentFormat } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Attachments } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -10,8 +12,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Attachments } from "~/drizzle/schema";
 import { MediaBackendType } from "~/packages/config-manager/config.type";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
diff --git a/classes/database/emoji.ts b/classes/database/emoji.ts
index 601e5e04..abb3df90 100644
--- a/classes/database/emoji.ts
+++ b/classes/database/emoji.ts
@@ -2,6 +2,8 @@ import { emojiValidatorWithColons, emojiValidatorWithIdentifiers } from "@/api";
 import { proxyUrl } from "@/response";
 import type { Emoji as ApiEmoji } from "@versia/client/types";
 import type { CustomEmojiExtension } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Emojis, Instances } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -12,8 +14,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Emojis, Instances } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 import { Instance } from "./instance.ts";
 
diff --git a/classes/database/instance.ts b/classes/database/instance.ts
index 3151fc87..4bc61954 100644
--- a/classes/database/instance.ts
+++ b/classes/database/instance.ts
@@ -5,6 +5,8 @@ import {
     type ValidationError,
 } from "@versia/federation";
 import type { InstanceMetadata } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Instances } from "@versia/kit/tables";
 import chalk from "chalk";
 import {
     type InferInsertModel,
@@ -14,8 +16,6 @@ import {
     eq,
     inArray,
 } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Instances } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
 import { User } from "./user.ts";
diff --git a/classes/database/like.ts b/classes/database/like.ts
index cece6c41..ea70c823 100644
--- a/classes/database/like.ts
+++ b/classes/database/like.ts
@@ -1,5 +1,7 @@
 import { RolePermission } from "@versia/client/types";
 import type { Delete, LikeExtension } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import { Likes } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -9,8 +11,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Likes } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import type { Status } from "../functions/status.ts";
 import type { UserType } from "../functions/user.ts";
diff --git a/classes/database/note.ts b/classes/database/note.ts
index a74cb77e..48fc20e7 100644
--- a/classes/database/note.ts
+++ b/classes/database/note.ts
@@ -14,6 +14,15 @@ import type {
     Delete as VersiaDelete,
     Note as VersiaNote,
 } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import {
+    Attachments,
+    EmojiToNote,
+    NoteToMentions,
+    Notes,
+    Notifications,
+    Users,
+} from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type SQL,
@@ -33,15 +42,6 @@ import {
     findManyNotes,
     parseTextMentions,
 } from "~/classes/functions/status";
-import { db } from "~/drizzle/db";
-import {
-    Attachments,
-    EmojiToNote,
-    NoteToMentions,
-    Notes,
-    Notifications,
-    Users,
-} from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { Application } from "./application.ts";
 import { Attachment } from "./attachment.ts";
diff --git a/classes/database/relationship.ts b/classes/database/relationship.ts
index 13285409..6dbc258f 100644
--- a/classes/database/relationship.ts
+++ b/classes/database/relationship.ts
@@ -1,4 +1,6 @@
 import type { Relationship as APIRelationship } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { Relationships } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -9,8 +11,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { Relationships } from "~/drizzle/schema";
 import { BaseInterface } from "./base.ts";
 import type { User } from "./user.ts";
 
diff --git a/classes/database/role.ts b/classes/database/role.ts
index 4e494f1e..b5ed912c 100644
--- a/classes/database/role.ts
+++ b/classes/database/role.ts
@@ -1,5 +1,7 @@
 import { proxyUrl } from "@/response";
 import { RolePermission } from "@versia/client/types";
+import { db } from "@versia/kit/db";
+import { RoleToUsers, Roles } from "@versia/kit/tables";
 import {
     type InferInsertModel,
     type InferSelectModel,
@@ -10,8 +12,6 @@ import {
     inArray,
 } from "drizzle-orm";
 import { z } from "zod";
-import { db } from "~/drizzle/db";
-import { RoleToUsers, Roles } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
 
diff --git a/classes/database/timeline.ts b/classes/database/timeline.ts
index d05386c0..f1984233 100644
--- a/classes/database/timeline.ts
+++ b/classes/database/timeline.ts
@@ -1,5 +1,5 @@
+import { Notes, Users } from "@versia/kit/tables";
 import { type SQL, gt } from "drizzle-orm";
-import { Notes, Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 import { Note } from "./note.ts";
 import { User } from "./user.ts";
diff --git a/classes/database/user.ts b/classes/database/user.ts
index ecf7e20e..2a69400c 100644
--- a/classes/database/user.ts
+++ b/classes/database/user.ts
@@ -19,6 +19,17 @@ import type {
     Unfollow,
     User as VersiaUser,
 } from "@versia/federation/types";
+import { db } from "@versia/kit/db";
+import {
+    EmojiToUser,
+    Likes,
+    NoteToMentions,
+    Notes,
+    Notifications,
+    type RolePermissions,
+    UserToPinnedNotes,
+    Users,
+} from "@versia/kit/tables";
 import chalk from "chalk";
 import {
     type InferInsertModel,
@@ -43,17 +54,6 @@ import {
     followRequestToVersia,
 } from "~/classes/functions/user";
 import { searchManager } from "~/classes/search/search-manager";
-import { db } from "~/drizzle/db";
-import {
-    EmojiToUser,
-    Likes,
-    NoteToMentions,
-    Notes,
-    Notifications,
-    type RolePermissions,
-    UserToPinnedNotes,
-    Users,
-} from "~/drizzle/schema";
 import { type Config, config } from "~/packages/config-manager";
 import type { KnownEntity } from "~/types/api.ts";
 import { BaseInterface } from "./base.ts";
diff --git a/classes/functions/notification.ts b/classes/functions/notification.ts
index fa8965f5..d140432a 100644
--- a/classes/functions/notification.ts
+++ b/classes/functions/notification.ts
@@ -1,8 +1,7 @@
 import type { Notification as ApiNotification } from "@versia/client/types";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
+import type { Notifications } from "@versia/kit/tables";
 import type { InferSelectModel } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import type { Notifications } from "~/drizzle/schema";
 import type { StatusWithRelations } from "./status.ts";
 import {
     type UserWithRelations,
diff --git a/classes/functions/status.ts b/classes/functions/status.ts
index 9dc9a2e5..4027ab11 100644
--- a/classes/functions/status.ts
+++ b/classes/functions/status.ts
@@ -2,7 +2,13 @@ import { mentionValidator } from "@/api";
 import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
 import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
 import type { ContentFormat } from "@versia/federation/types";
-import { User } from "@versia/kit/db";
+import { User, db } from "@versia/kit/db";
+import {
+    type Attachments,
+    Instances,
+    type Notes,
+    Users,
+} from "@versia/kit/tables";
 import {
     type InferSelectModel,
     and,
@@ -27,13 +33,6 @@ import markdownItContainer from "markdown-it-container";
 import markdownItTocDoneRight from "markdown-it-toc-done-right";
 import type { ApplicationType } from "~/classes/database/application.ts";
 import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
-import { db } from "~/drizzle/db";
-import {
-    type Attachments,
-    Instances,
-    type Notes,
-    Users,
-} from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import {
     type UserWithInstance,
diff --git a/classes/functions/token.ts b/classes/functions/token.ts
index feba0bda..434c4c7f 100644
--- a/classes/functions/token.ts
+++ b/classes/functions/token.ts
@@ -1,5 +1,5 @@
+import type { Tokens } from "@versia/kit/tables";
 import type { InferSelectModel } from "drizzle-orm";
-import type { Tokens } from "~/drizzle/schema";
 
 /**
  * The type of token.
diff --git a/classes/functions/user.ts b/classes/functions/user.ts
index c3a77b81..47e5c5d9 100644
--- a/classes/functions/user.ts
+++ b/classes/functions/user.ts
@@ -3,18 +3,17 @@ import type {
     FollowAccept,
     FollowReject,
 } from "@versia/federation/types";
-import { User } from "@versia/kit/db";
-import { type InferSelectModel, eq, sql } from "drizzle-orm";
-import type { ApplicationType } from "~/classes/database/application.ts";
-import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
-import { db } from "~/drizzle/db";
+import { User, db } from "@versia/kit/db";
 import {
     Applications,
     type Instances,
     type Roles,
     Tokens,
     type Users,
-} from "~/drizzle/schema";
+} from "@versia/kit/tables";
+import { type InferSelectModel, eq, sql } from "drizzle-orm";
+import type { ApplicationType } from "~/classes/database/application.ts";
+import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
 import type { Token } from "./token.ts";
 
 export type UserType = InferSelectModel<typeof Users>;
diff --git a/classes/inbox/processor.test.ts b/classes/inbox/processor.test.ts
index e2864f27..c0883fb4 100644
--- a/classes/inbox/processor.test.ts
+++ b/classes/inbox/processor.test.ts
@@ -1,8 +1,7 @@
 import { beforeEach, describe, expect, jest, mock, test } from "bun:test";
 import { SignatureValidator } from "@versia/federation";
 import type { Entity, Note as VersiaNote } from "@versia/federation/types";
-import { Note, Relationship, User } from "@versia/kit/db";
-import { db } from "@versia/kit/db";
+import { Note, Relationship, User, db } from "@versia/kit/db";
 import type { Context } from "hono";
 import { ValidationError } from "zod-validation-error";
 import { config } from "~/packages/config-manager/index.ts";
diff --git a/classes/search/search-manager.ts b/classes/search/search-manager.ts
index 9c85af4e..ab3783ec 100644
--- a/classes/search/search-manager.ts
+++ b/classes/search/search-manager.ts
@@ -4,12 +4,11 @@
  */
 
 import { getLogger } from "@logtape/logtape";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
 import {
     Ingest as SonicChannelIngest,
     Search as SonicChannelSearch,
 } from "sonic-channel";
-import { db } from "~/drizzle/db";
 import { type Config, config } from "~/packages/config-manager";
 
 /**
diff --git a/cli/classes.ts b/cli/classes.ts
index 1d3b71b9..b256e222 100644
--- a/cli/classes.ts
+++ b/cli/classes.ts
@@ -1,10 +1,9 @@
 import { parseUserAddress, userAddressValidator } from "@/api";
 import { Args, type Command, Flags, type Interfaces } from "@oclif/core";
-import { Instance, User } from "@versia/kit/db";
+import { Instance, User, db } from "@versia/kit/db";
+import { Emojis, Instances, Users } from "@versia/kit/tables";
 import chalk from "chalk";
 import { and, eq, getTableColumns, like } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Emojis, Instances, Users } from "~/drizzle/schema";
 import { BaseCommand } from "./base.ts";
 
 export type FlagsType<T extends typeof Command> = Interfaces.InferredFlags<
diff --git a/cli/commands/emoji/add.ts b/cli/commands/emoji/add.ts
index 06b7bc32..656a6145 100644
--- a/cli/commands/emoji/add.ts
+++ b/cli/commands/emoji/add.ts
@@ -1,11 +1,11 @@
 import { Args } from "@oclif/core";
 import { Attachment, Emoji } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import chalk from "chalk";
 import { and, eq, isNull } from "drizzle-orm";
 import ora from "ora";
 import { MediaManager } from "~/classes/media/media-manager";
 import { BaseCommand } from "~/cli/base";
-import { Emojis } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export default class EmojiAdd extends BaseCommand<typeof EmojiAdd> {
diff --git a/cli/commands/emoji/delete.ts b/cli/commands/emoji/delete.ts
index 487afdb8..c3fdd37a 100644
--- a/cli/commands/emoji/delete.ts
+++ b/cli/commands/emoji/delete.ts
@@ -1,13 +1,13 @@
 import confirm from "@inquirer/confirm";
 import { Flags } from "@oclif/core";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import chalk from "chalk";
 import { eq } from "drizzle-orm";
 import ora from "ora";
 import { MediaManager } from "~/classes/media/media-manager";
 import { EmojiFinderCommand } from "~/cli/classes";
 import { formatArray } from "~/cli/utils/format";
-import { db } from "~/drizzle/db";
-import { Emojis } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export default class EmojiDelete extends EmojiFinderCommand<
diff --git a/cli/commands/emoji/import.ts b/cli/commands/emoji/import.ts
index 8475e862..7a939852 100644
--- a/cli/commands/emoji/import.ts
+++ b/cli/commands/emoji/import.ts
@@ -1,5 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import { Attachment, Emoji } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import chalk from "chalk";
 import { and, inArray, isNull } from "drizzle-orm";
 import { lookup } from "mime-types";
@@ -7,7 +8,6 @@ import ora from "ora";
 import { unzip } from "unzipit";
 import { MediaManager } from "~/classes/media/media-manager";
 import { BaseCommand } from "~/cli/base";
-import { Emojis } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 type MetaType = {
diff --git a/cli/commands/emoji/list.ts b/cli/commands/emoji/list.ts
index 5db040fe..130ad571 100644
--- a/cli/commands/emoji/list.ts
+++ b/cli/commands/emoji/list.ts
@@ -1,9 +1,9 @@
 import { Flags } from "@oclif/core";
+import { db } from "@versia/kit/db";
+import { Emojis, Instances, Users } from "@versia/kit/tables";
 import { and, eq, getTableColumns, isNotNull, isNull } from "drizzle-orm";
 import { BaseCommand } from "~/cli/base";
 import { formatArray } from "~/cli/utils/format";
-import { db } from "~/drizzle/db";
-import { Emojis, Instances, Users } from "~/drizzle/schema";
 
 export default class EmojiList extends BaseCommand<typeof EmojiList> {
     static override args = {};
diff --git a/cli/commands/user/create.ts b/cli/commands/user/create.ts
index bbc623f7..d009b30a 100644
--- a/cli/commands/user/create.ts
+++ b/cli/commands/user/create.ts
@@ -1,12 +1,12 @@
 import input from "@inquirer/input";
 import { Args, Flags } from "@oclif/core";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import chalk from "chalk";
 import { eq } from "drizzle-orm";
 import { renderUnicodeCompact } from "uqr";
 import { BaseCommand } from "~/cli/base";
 import { formatArray } from "~/cli/utils/format";
-import { Users } from "~/drizzle/schema";
 
 export default class UserCreate extends BaseCommand<typeof UserCreate> {
     static override args = {
diff --git a/cli/commands/user/list.ts b/cli/commands/user/list.ts
index 890d638a..c77532d7 100644
--- a/cli/commands/user/list.ts
+++ b/cli/commands/user/list.ts
@@ -1,9 +1,9 @@
 import { Flags } from "@oclif/core";
 import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNotNull, isNull } from "drizzle-orm";
 import { BaseCommand } from "~/cli/base";
 import { formatArray } from "~/cli/utils/format";
-import { Users } from "~/drizzle/schema";
 
 export default class UserList extends BaseCommand<typeof UserList> {
     static override args = {};
diff --git a/packages/config-manager/config.type.ts b/packages/config-manager/config.type.ts
index c7c7e757..13352e0d 100644
--- a/packages/config-manager/config.type.ts
+++ b/packages/config-manager/config.type.ts
@@ -1,6 +1,10 @@
+import {
+    ADMIN_ROLES,
+    DEFAULT_ROLES,
+    RolePermissions,
+} from "@versia/kit/tables";
 import { types as mimeTypes } from "mime-types";
 import { z } from "zod";
-import { ADMIN_ROLES, DEFAULT_ROLES, RolePermissions } from "~/drizzle/schema";
 
 export enum MediaBackendType {
     Local = "local",
diff --git a/plugins/openid/routes/authorize.ts b/plugins/openid/routes/authorize.ts
index e75cff0a..de16591f 100644
--- a/plugins/openid/routes/authorize.ts
+++ b/plugins/openid/routes/authorize.ts
@@ -1,7 +1,6 @@
 import { auth, jsonOrForm } from "@/api";
 import { randomString } from "@/math";
-import { db } from "@versia/kit/db";
-import { Application, User } from "@versia/kit/db";
+import { Application, User, db } from "@versia/kit/db";
 import { RolePermissions, Tokens } from "@versia/kit/tables";
 import { type JWTPayload, SignJWT, jwtVerify } from "jose";
 import { JOSEError } from "jose/errors";
diff --git a/plugins/openid/routes/oauth/revoke.test.ts b/plugins/openid/routes/oauth/revoke.test.ts
index 810b0025..b72ce066 100644
--- a/plugins/openid/routes/oauth/revoke.test.ts
+++ b/plugins/openid/routes/oauth/revoke.test.ts
@@ -1,6 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia/kit/db";
-import { Application } from "@versia/kit/db";
+import { Application, db } from "@versia/kit/db";
 import { eq } from "@versia/kit/drizzle";
 import { Tokens } from "@versia/kit/tables";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
diff --git a/plugins/openid/routes/oauth/sso.ts b/plugins/openid/routes/oauth/sso.ts
index 14144b3a..0ffb791c 100644
--- a/plugins/openid/routes/oauth/sso.ts
+++ b/plugins/openid/routes/oauth/sso.ts
@@ -1,6 +1,5 @@
 import { createRoute, z } from "@hono/zod-openapi";
-import { db } from "@versia/kit/db";
-import { Application } from "@versia/kit/db";
+import { Application, db } from "@versia/kit/db";
 import { OpenIdLoginFlows } from "@versia/kit/tables";
 import {
     calculatePKCECodeChallenge,
diff --git a/plugins/openid/routes/oauth/token.test.ts b/plugins/openid/routes/oauth/token.test.ts
index b1884903..5be8be75 100644
--- a/plugins/openid/routes/oauth/token.test.ts
+++ b/plugins/openid/routes/oauth/token.test.ts
@@ -1,6 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia/kit/db";
-import { Application } from "@versia/kit/db";
+import { Application, db } from "@versia/kit/db";
 import { eq } from "@versia/kit/drizzle";
 import { Tokens } from "@versia/kit/tables";
 import { fakeRequest, getTestUsers } from "~/tests/utils";
diff --git a/plugins/openid/routes/oauth/token.ts b/plugins/openid/routes/oauth/token.ts
index b50e7d13..e4696e1a 100644
--- a/plugins/openid/routes/oauth/token.ts
+++ b/plugins/openid/routes/oauth/token.ts
@@ -1,7 +1,6 @@
 import { jsonOrForm } from "@/api";
 import { createRoute, z } from "@hono/zod-openapi";
-import { db } from "@versia/kit/db";
-import { Application } from "@versia/kit/db";
+import { Application, db } from "@versia/kit/db";
 import { eq } from "@versia/kit/drizzle";
 import { Tokens } from "@versia/kit/tables";
 import type { PluginType } from "../../index.ts";
diff --git a/plugins/openid/routes/sso/index.ts b/plugins/openid/routes/sso/index.ts
index bee04b62..a6cc8ded 100644
--- a/plugins/openid/routes/sso/index.ts
+++ b/plugins/openid/routes/sso/index.ts
@@ -1,6 +1,5 @@
 import { auth } from "@/api";
-import { db } from "@versia/kit/db";
-import { Application } from "@versia/kit/db";
+import { Application, db } from "@versia/kit/db";
 import { OpenIdLoginFlows, RolePermissions } from "@versia/kit/tables";
 import {
     calculatePKCECodeChallenge,
diff --git a/tests/oauth-scopes.test.ts b/tests/oauth-scopes.test.ts
index 8e695b26..22722bd7 100644
--- a/tests/oauth-scopes.test.ts
+++ b/tests/oauth-scopes.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "bun:test";
 import { checkIfOauthIsValid } from "@/oauth";
-import { Application, type ApplicationType } from "@versia/kit/db";
+import { Application } from "@versia/kit/db";
+import type { ApplicationType } from "~/classes/database/application";
 
 describe("checkIfOauthIsValid", () => {
     it("should return true when routeScopes and application.scopes are empty", () => {
diff --git a/tests/utils.ts b/tests/utils.ts
index 927d4d4f..4ede9efa 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -1,14 +1,13 @@
 import { generateChallenge } from "@/challenges";
 import { randomString } from "@/math";
-import { Note, User } from "@versia/kit/db";
+import { Note, User, db } from "@versia/kit/db";
+import { Notes, Tokens, Users } from "@versia/kit/tables";
 import { solveChallenge } from "altcha-lib";
 import { asc, inArray, like } from "drizzle-orm";
 import { appFactory } from "~/app";
 import type { Status } from "~/classes/functions/status";
 import { searchManager } from "~/classes/search/search-manager";
-import { db } from "~/drizzle/db";
 import { setupDatabase } from "~/drizzle/db";
-import { Notes, Tokens, Users } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 await setupDatabase();
diff --git a/types/api.ts b/types/api.ts
index 9db1ff54..b40b5cbc 100644
--- a/types/api.ts
+++ b/types/api.ts
@@ -12,9 +12,9 @@ import type {
     User,
 } from "@versia/federation/types";
 import type { Application, User as DatabaseUser } from "@versia/kit/db";
+import type { RolePermissions } from "@versia/kit/tables";
 import type { SocketAddress } from "bun";
 import { z } from "zod";
-import type { RolePermissions } from "~/drizzle/schema";
 import type { Config } from "~/packages/config-manager";
 
 export type HttpVerb = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
diff --git a/utils/api.ts b/utils/api.ts
index a66fb4d5..f3d21cba 100644
--- a/utils/api.ts
+++ b/utils/api.ts
@@ -2,7 +2,8 @@ import type { Context } from "@hono/hono";
 import { createMiddleware } from "@hono/hono/factory";
 import type { OpenAPIHono } from "@hono/zod-openapi";
 import { getLogger } from "@logtape/logtape";
-import { Application, type User } from "@versia/kit/db";
+import { Application, type User, db } from "@versia/kit/db";
+import { Challenges } from "@versia/kit/tables";
 import { extractParams, verifySolution } from "altcha-lib";
 import chalk from "chalk";
 import { eq } from "drizzle-orm";
@@ -24,8 +25,6 @@ import { parse } from "qs";
 import type { z } from "zod";
 import { fromZodError } from "zod-validation-error";
 import { type AuthData, getFromHeader } from "~/classes/functions/user";
-import { db } from "~/drizzle/db";
-import { Challenges } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager/index.ts";
 import type { ApiRouteMetadata, HonoEnv, HttpVerb } from "~/types/api";
 
diff --git a/utils/challenges.ts b/utils/challenges.ts
index 55d93ab2..1809f038 100644
--- a/utils/challenges.ts
+++ b/utils/challenges.ts
@@ -1,7 +1,7 @@
+import { db } from "@versia/kit/db";
+import { Challenges } from "@versia/kit/tables";
 import { createChallenge } from "altcha-lib";
 import { sql } from "drizzle-orm";
-import { db } from "~/drizzle/db";
-import { Challenges } from "~/drizzle/schema";
 import { config } from "~/packages/config-manager";
 
 export const generateChallenge = async (
diff --git a/utils/timelines.ts b/utils/timelines.ts
index 7c5e0f5a..b867bce3 100644
--- a/utils/timelines.ts
+++ b/utils/timelines.ts
@@ -1,10 +1,10 @@
+import type { db } from "@versia/kit/db";
 import type {
     Notification,
     findManyNotifications,
 } from "~/classes/functions/notification";
 import type { Status, findManyNotes } from "~/classes/functions/status";
 import type { UserType, findManyUsers } from "~/classes/functions/user";
-import type { db } from "~/drizzle/db";
 import { config } from "~/packages/config-manager/index.ts";
 
 export async function fetchTimeline<T extends UserType | Status | Notification>(
diff --git a/worker.ts b/worker.ts
index fa5adb02..d8743c6e 100644
--- a/worker.ts
+++ b/worker.ts
@@ -26,11 +26,14 @@ const deliveryQueue = new Queue<{ noteId: string }, void, DeliveryJobType>(
     },
 );
 
-const inboxQueue = new Queue<{ data: Entity }, void, InboxJobType>("inbox", {
-    connection,
-});
+export const inboxQueue = new Queue<{ data: Entity }, void, InboxJobType>(
+    "inbox",
+    {
+        connection,
+    },
+);
 
-const worker = new Worker<{ noteId: string }, void, DeliveryJobType>(
+export const worker = new Worker<{ noteId: string }, void, DeliveryJobType>(
     deliveryQueue.name,
     async (job) => {
         switch (job.name) {