diff --git a/app/components/__tests__/AutodraftSettings.test.tsx b/app/components/__tests__/AutodraftSettings.test.tsx
index 1611179..38fe38a 100644
--- a/app/components/__tests__/AutodraftSettings.test.tsx
+++ b/app/components/__tests__/AutodraftSettings.test.tsx
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
-import { AutodraftSettings } from '../AutodraftSettings';
+import { AutodraftSettings } from '~/components/AutodraftSettings';
 
 // Mock fetch
 global.fetch = vi.fn();
diff --git a/app/lib/__tests__/draft-eligibility.test.ts b/app/lib/__tests__/draft-eligibility.test.ts
index e62b62d..0ba225f 100644
--- a/app/lib/__tests__/draft-eligibility.test.ts
+++ b/app/lib/__tests__/draft-eligibility.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { calculateDraftEligibility, getEligibilitySummary } from "../draft-eligibility";
+import { calculateDraftEligibility, getEligibilitySummary } from "~/lib/draft-eligibility";
 
 // Helper to create test data
 const createSport = (id: string, name: string) => ({ id, name });
diff --git a/app/lib/__tests__/utils.test.ts b/app/lib/__tests__/utils.test.ts
index 01b2086..6c8b98b 100644
--- a/app/lib/__tests__/utils.test.ts
+++ b/app/lib/__tests__/utils.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { cn } from '../utils';
+import { cn } from '~/lib/utils';
 
 describe('Utils', () => {
   describe('cn (className merger)', () => {
diff --git a/app/routes/api/autodraft.update.ts b/app/routes/api/autodraft.update.ts
index 5a9f293..6ffb14b 100644
--- a/app/routes/api/autodraft.update.ts
+++ b/app/routes/api/autodraft.update.ts
@@ -1,8 +1,8 @@
 import { getAuth } from "@clerk/react-router/server";
-import { database } from "../../../database/context";
-import * as schema from "../../../database/schema";
+import { database } from "~/database/context";
+import * as schema from "~/database/schema";
 import { eq, and } from "drizzle-orm";
-import { getSocketIO } from "../../../server/socket";
+import { getSocketIO } from "~/server/socket";
 
 export async function action(args: any) {
   const { request } = args;
diff --git a/app/routes/leagues/__tests__/autodraft.test.ts b/app/routes/leagues/__tests__/autodraft.test.ts
index ae64438..fa4a886 100644
--- a/app/routes/leagues/__tests__/autodraft.test.ts
+++ b/app/routes/leagues/__tests__/autodraft.test.ts
@@ -1,9 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { action } from "../../api/autodraft.update";
+import { action } from "~/routes/api/autodraft.update";
 
 // Mock dependencies
-vi.mock("../../../../database/context");
-vi.mock("../../../../server/socket", () => ({
+vi.mock("~/database/context");
+vi.mock("~/server/socket", () => ({
   getSocketIO: vi.fn(),
 }));
 vi.mock("@clerk/react-router/server", () => ({
@@ -27,7 +27,7 @@ describe("Autodraft Settings API", () => {
       emit: vi.fn(),
     };
 
-    const socketModule = await import("../../../../server/socket");
+    const socketModule = await import("~/server/socket");
     vi.mocked(socketModule.getSocketIO).mockReturnValue(mockSocketIO);
 
     // Mock database
@@ -48,7 +48,7 @@ describe("Autodraft Settings API", () => {
       values: vi.fn().mockReturnThis(),
     };
 
-    const { database } = await import("../../../../database/context");
+    const { database } = await import("~/database/context");
     vi.mocked(database).mockReturnValue(mockDb);
   });
 
diff --git a/server/app.ts b/server/app.ts
index 990c4af..970e972 100644
--- a/server/app.ts
+++ b/server/app.ts
@@ -4,9 +4,9 @@ import express from "express";
 import postgres from "postgres";
 import { RouterContextProvider } from "react-router";
 
-import { DatabaseContext } from "../database/context";
-import * as schema from "../database/schema";
-import { expressValueContext } from "../app/contexts/express";
+import { DatabaseContext } from "~/database/context";
+import * as schema from "~/database/schema";
+import { expressValueContext } from "~/contexts/express";
 
 export const app = express();
 
diff --git a/server/timer.ts b/server/timer.ts
index db3d6a1..b6735ed 100644
--- a/server/timer.ts
+++ b/server/timer.ts
@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
-import * as schema from "../database/schema";
+import * as schema from "~/database/schema";
 import { eq, and, desc, asc, inArray, notInArray } from "drizzle-orm";
 import { getSocketIO } from "./socket";
 
diff --git a/tsconfig.json b/tsconfig.json
index a49953d..5801aad 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,10 @@
     "noEmit": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./app/*"]
+      "~/*": ["./app/*"],
+      "@/*": ["./app/*"],
+      "~/database/*": ["./database/*"],
+      "~/server/*": ["./server/*"]
     }
   }
 }
diff --git a/tsconfig.server.json b/tsconfig.server.json
index a48ed84..9affce8 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -19,7 +19,9 @@
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"],
-      "~/database/*": ["./database/*"]
+      "@/*": ["./app/*"],
+      "~/database/*": ["./database/*"],
+      "~/server/*": ["./server/*"]
     }
   },
   "include": [
diff --git a/tsconfig.vite.json b/tsconfig.vite.json
index c1b2c43..65c39fb 100644
--- a/tsconfig.vite.json
+++ b/tsconfig.vite.json
@@ -25,6 +25,7 @@
     "paths": {
       "@/*": ["./app/*"],
       "~/database/*": ["./database/*"],
+      "~/server/*": ["./server/*"],
       "~/*": ["./app/*"]
     },
     "esModuleInterop": true,
diff --git a/vitest.config.ts b/vitest.config.ts
index c7f35e7..58ca085 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -24,9 +24,12 @@ export default defineConfig({
     },
   },
   resolve: {
-    alias: {
-      '~': path.resolve(__dirname, './app'),
-      'app': path.resolve(__dirname, './app'),
-    },
+    alias: [
+      { find: /^~\/database\/(.*)$/, replacement: path.resolve(__dirname, './database/$1') },
+      { find: /^~\/server\/(.*)$/, replacement: path.resolve(__dirname, './server/$1') },
+      { find: /^~\/(.*)$/, replacement: path.resolve(__dirname, './app/$1') },
+      { find: /^@\/(.*)$/, replacement: path.resolve(__dirname, './app/$1') },
+      { find: 'app', replacement: path.resolve(__dirname, './app') },
+    ],
   },
 });