diff --git a/app/routes/api.room.create.tsx b/app/routes/api.room.create.tsx
index 5af9d47..a667e2f 100644
--- a/app/routes/api.room.create.tsx
+++ b/app/routes/api.room.create.tsx
@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 import { invalidateCache } from "~/services/redis.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
diff --git a/app/routes/api.room.delete.$roomId.tsx b/app/routes/api.room.delete.$roomId.tsx
index d1f7c92..62ed672 100644
--- a/app/routes/api.room.delete.$roomId.tsx
+++ b/app/routes/api.room.delete.$roomId.tsx
@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
 import { invalidateCache } from "~/services/redis.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
   const { userId } = await getAuth({ context, params, request });
diff --git a/app/routes/api.room.get.$roomId.tsx b/app/routes/api.room.get.$roomId.tsx
index d8f2c0b..80cf03b 100644
--- a/app/routes/api.room.get.$roomId.tsx
+++ b/app/routes/api.room.get.$roomId.tsx
@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {
diff --git a/app/routes/api.room.get.all.tsx b/app/routes/api.room.get.all.tsx
index 8309706..b0bc8a9 100644
--- a/app/routes/api.room.get.all.tsx
+++ b/app/routes/api.room.get.all.tsx
@@ -5,7 +5,7 @@ import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
 import { fetchCache, setCache } from "~/services/redis.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {
diff --git a/app/routes/api.room.presence.get.$roomId.tsx b/app/routes/api.room.presence.get.$roomId.tsx
index f7cd99b..0c67439 100644
--- a/app/routes/api.room.presence.get.$roomId.tsx
+++ b/app/routes/api.room.presence.get.$roomId.tsx
@@ -4,7 +4,7 @@ import { and, eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { presence } from "~/services/schema";
+import { presence } from "~/services/schema.server";
 import { createId } from "@paralleldrive/cuid2";
 
 export async function loader({ context, params, request }: LoaderFunctionArgs) {
diff --git a/app/routes/api.room.set.$roomId.tsx b/app/routes/api.room.set.$roomId.tsx
index a0224c5..12b05fe 100644
--- a/app/routes/api.room.set.$roomId.tsx
+++ b/app/routes/api.room.set.$roomId.tsx
@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { logs, rooms, votes } from "~/services/schema";
+import { logs, rooms, votes } from "~/services/schema.server";
 import { eq } from "drizzle-orm";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
diff --git a/app/routes/api.vote.set.$roomId.tsx b/app/routes/api.vote.set.$roomId.tsx
index 8a6c95b..a91d605 100644
--- a/app/routes/api.vote.set.$roomId.tsx
+++ b/app/routes/api.vote.set.$roomId.tsx
@@ -3,7 +3,7 @@ import { ActionFunctionArgs, json } from "@remix-run/node";
 import { createId } from "@paralleldrive/cuid2";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { votes } from "~/services/schema";
+import { votes } from "~/services/schema.server";
 
 export async function action({ request, params, context }: ActionFunctionArgs) {
   const { userId } = await getAuth({ context, params, request });
diff --git a/app/routes/api.votes.get.$roomId.tsx b/app/routes/api.votes.get.$roomId.tsx
index 30be487..cd5c87f 100644
--- a/app/routes/api.votes.get.$roomId.tsx
+++ b/app/routes/api.votes.get.$roomId.tsx
@@ -4,7 +4,7 @@ import { eq } from "drizzle-orm";
 import { eventStream } from "remix-utils/sse/server";
 import { db } from "~/services/db.server";
 import { emitter } from "~/services/emitter.server";
-import { votes } from "~/services/schema";
+import { votes } from "~/services/schema.server";
 
 // Get Room List
 export async function loader({ context, params, request }: LoaderFunctionArgs) {
diff --git a/app/routes/room.$roomId.tsx b/app/routes/room.$roomId.tsx
index a9a527c..fcfdb23 100644
--- a/app/routes/room.$roomId.tsx
+++ b/app/routes/room.$roomId.tsx
@@ -25,7 +25,7 @@ import {
 import { isAdmin, jsonToCsv } from "~/services/helpers.client";
 import { ClerkLoaded, ClerkLoading, useUser } from "@clerk/remix";
 import { db } from "~/services/db.server";
-import { rooms } from "~/services/schema";
+import { rooms } from "~/services/schema.server";
 import { eq } from "drizzle-orm";
 import ErrorPage from "~/components/ErrorPage";
 import { isShit } from "~/services/helpers.server";
diff --git a/app/services/db.server.ts b/app/services/db.server.ts
index 5f38aae..55822c4 100644
--- a/app/services/db.server.ts
+++ b/app/services/db.server.ts
@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/libsql";
 import { createClient } from "@libsql/client";
-import * as schema from "./schema";
+import * as schema from "./schema.server";
 
 const client = createClient({
   url: process.env.DATABASE_URL!,
diff --git a/app/services/schema.ts b/app/services/schema.server.ts
similarity index 100%
rename from app/services/schema.ts
rename to app/services/schema.server.ts
diff --git a/app/services/webhookhelpers.server.ts b/app/services/webhookhelpers.server.ts
index 67a8642..2b3571b 100644
--- a/app/services/webhookhelpers.server.ts
+++ b/app/services/webhookhelpers.server.ts
@@ -1,6 +1,6 @@
 import { eq } from "drizzle-orm";
 import { db } from "./db.server";
-import { rooms } from "./schema";
+import { rooms } from "./schema.server";
 
 export const onUserDeletedHandler = async (userId: string | undefined) => {
   if (!userId) {