diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 7e3fc69..12ea787 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,10 +1,10 @@
 import { config } from '$config';
-import { logStartup } from './utils/logger/startup.ts';
-import { logSettings } from './utils/logger/settings.ts';
+import { logStartup } from '$logger/startup.ts';
+import { logSettings } from '$logger/settings.ts';
 import { db } from '$db/db.ts';
 import { runMigrations } from '$db/migrations.ts';
-import { initializeJobs } from './jobs/init.ts';
-import { jobScheduler } from './jobs/scheduler.ts';
+import { initializeJobs } from '$jobs/init.ts';
+import { jobScheduler } from '$jobs/scheduler.ts';
 
 // Initialize configuration on server startup
 await config.init();
diff --git a/src/components/form/NumberInput.svelte b/src/lib/client/ui/form/NumberInput.svelte
similarity index 100%
rename from src/components/form/NumberInput.svelte
rename to src/lib/client/ui/form/NumberInput.svelte
diff --git a/src/components/form/TagInput.svelte b/src/lib/client/ui/form/TagInput.svelte
similarity index 100%
rename from src/components/form/TagInput.svelte
rename to src/lib/client/ui/form/TagInput.svelte
diff --git a/src/components/modal/Modal.svelte b/src/lib/client/ui/modal/Modal.svelte
similarity index 100%
rename from src/components/modal/Modal.svelte
rename to src/lib/client/ui/modal/Modal.svelte
diff --git a/src/components/navigation/navbar/navbar.svelte b/src/lib/client/ui/navigation/navbar/navbar.svelte
similarity index 100%
rename from src/components/navigation/navbar/navbar.svelte
rename to src/lib/client/ui/navigation/navbar/navbar.svelte
diff --git a/src/components/navigation/navbar/themeToggle.svelte b/src/lib/client/ui/navigation/navbar/themeToggle.svelte
similarity index 100%
rename from src/components/navigation/navbar/themeToggle.svelte
rename to src/lib/client/ui/navigation/navbar/themeToggle.svelte
diff --git a/src/components/navigation/pageNav/group.svelte b/src/lib/client/ui/navigation/pageNav/group.svelte
similarity index 100%
rename from src/components/navigation/pageNav/group.svelte
rename to src/lib/client/ui/navigation/pageNav/group.svelte
diff --git a/src/components/navigation/pageNav/groupHeader.svelte b/src/lib/client/ui/navigation/pageNav/groupHeader.svelte
similarity index 100%
rename from src/components/navigation/pageNav/groupHeader.svelte
rename to src/lib/client/ui/navigation/pageNav/groupHeader.svelte
diff --git a/src/components/navigation/pageNav/groupItem.svelte b/src/lib/client/ui/navigation/pageNav/groupItem.svelte
similarity index 100%
rename from src/components/navigation/pageNav/groupItem.svelte
rename to src/lib/client/ui/navigation/pageNav/groupItem.svelte
diff --git a/src/components/navigation/pageNav/pageNav.svelte b/src/lib/client/ui/navigation/pageNav/pageNav.svelte
similarity index 100%
rename from src/components/navigation/pageNav/pageNav.svelte
rename to src/lib/client/ui/navigation/pageNav/pageNav.svelte
diff --git a/src/components/navigation/pageNav/version.svelte b/src/lib/client/ui/navigation/pageNav/version.svelte
similarity index 92%
rename from src/components/navigation/pageNav/version.svelte
rename to src/lib/client/ui/navigation/pageNav/version.svelte
index 302a40a..4e4bf12 100644
--- a/src/components/navigation/pageNav/version.svelte
+++ b/src/lib/client/ui/navigation/pageNav/version.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { getBuildLabel, VERSION } from '$logger/version.ts';
+	import { getBuildLabel, VERSION } from '$shared/version.ts';
 	import { Package } from 'lucide-svelte';
 
 	const buildLabel = getBuildLabel();
diff --git a/src/db/db.ts b/src/lib/server/db/db.ts
similarity index 100%
rename from src/db/db.ts
rename to src/lib/server/db/db.ts
diff --git a/src/db/migrations.ts b/src/lib/server/db/migrations.ts
similarity index 100%
rename from src/db/migrations.ts
rename to src/lib/server/db/migrations.ts
diff --git a/src/db/migrations/001_create_arr_instances.ts b/src/lib/server/db/migrations/001_create_arr_instances.ts
similarity index 100%
rename from src/db/migrations/001_create_arr_instances.ts
rename to src/lib/server/db/migrations/001_create_arr_instances.ts
diff --git a/src/db/migrations/002_remove_sync_profile.ts b/src/lib/server/db/migrations/002_remove_sync_profile.ts
similarity index 100%
rename from src/db/migrations/002_remove_sync_profile.ts
rename to src/lib/server/db/migrations/002_remove_sync_profile.ts
diff --git a/src/db/migrations/003_create_log_settings.ts b/src/lib/server/db/migrations/003_create_log_settings.ts
similarity index 100%
rename from src/db/migrations/003_create_log_settings.ts
rename to src/lib/server/db/migrations/003_create_log_settings.ts
diff --git a/src/db/migrations/004_create_jobs_tables.ts b/src/lib/server/db/migrations/004_create_jobs_tables.ts
similarity index 100%
rename from src/db/migrations/004_create_jobs_tables.ts
rename to src/lib/server/db/migrations/004_create_jobs_tables.ts
diff --git a/src/db/migrations/005_create_backup_settings.ts b/src/lib/server/db/migrations/005_create_backup_settings.ts
similarity index 100%
rename from src/db/migrations/005_create_backup_settings.ts
rename to src/lib/server/db/migrations/005_create_backup_settings.ts
diff --git a/src/db/migrations/006_simplify_log_settings.ts b/src/lib/server/db/migrations/006_simplify_log_settings.ts
similarity index 100%
rename from src/db/migrations/006_simplify_log_settings.ts
rename to src/lib/server/db/migrations/006_simplify_log_settings.ts
diff --git a/src/db/migrations/007_create_notification_tables.ts b/src/lib/server/db/migrations/007_create_notification_tables.ts
similarity index 100%
rename from src/db/migrations/007_create_notification_tables.ts
rename to src/lib/server/db/migrations/007_create_notification_tables.ts
diff --git a/src/db/migrations/_template.ts b/src/lib/server/db/migrations/_template.ts
similarity index 100%
rename from src/db/migrations/_template.ts
rename to src/lib/server/db/migrations/_template.ts
diff --git a/src/db/queries/arrInstances.ts b/src/lib/server/db/queries/arrInstances.ts
similarity index 100%
rename from src/db/queries/arrInstances.ts
rename to src/lib/server/db/queries/arrInstances.ts
diff --git a/src/db/queries/backupSettings.ts b/src/lib/server/db/queries/backupSettings.ts
similarity index 100%
rename from src/db/queries/backupSettings.ts
rename to src/lib/server/db/queries/backupSettings.ts
diff --git a/src/db/queries/jobs.ts b/src/lib/server/db/queries/jobs.ts
similarity index 100%
rename from src/db/queries/jobs.ts
rename to src/lib/server/db/queries/jobs.ts
diff --git a/src/db/queries/logSettings.ts b/src/lib/server/db/queries/logSettings.ts
similarity index 100%
rename from src/db/queries/logSettings.ts
rename to src/lib/server/db/queries/logSettings.ts
diff --git a/src/db/queries/notificationHistory.ts b/src/lib/server/db/queries/notificationHistory.ts
similarity index 100%
rename from src/db/queries/notificationHistory.ts
rename to src/lib/server/db/queries/notificationHistory.ts
diff --git a/src/db/queries/notificationServices.ts b/src/lib/server/db/queries/notificationServices.ts
similarity index 100%
rename from src/db/queries/notificationServices.ts
rename to src/lib/server/db/queries/notificationServices.ts
diff --git a/src/db/schema.sql b/src/lib/server/db/schema.sql
similarity index 100%
rename from src/db/schema.sql
rename to src/lib/server/db/schema.sql
diff --git a/src/jobs/definitions/cleanupBackups.ts b/src/lib/server/jobs/definitions/cleanupBackups.ts
similarity index 100%
rename from src/jobs/definitions/cleanupBackups.ts
rename to src/lib/server/jobs/definitions/cleanupBackups.ts
diff --git a/src/jobs/definitions/cleanupLogs.ts b/src/lib/server/jobs/definitions/cleanupLogs.ts
similarity index 100%
rename from src/jobs/definitions/cleanupLogs.ts
rename to src/lib/server/jobs/definitions/cleanupLogs.ts
diff --git a/src/jobs/definitions/createBackup.ts b/src/lib/server/jobs/definitions/createBackup.ts
similarity index 100%
rename from src/jobs/definitions/createBackup.ts
rename to src/lib/server/jobs/definitions/createBackup.ts
diff --git a/src/jobs/init.ts b/src/lib/server/jobs/init.ts
similarity index 100%
rename from src/jobs/init.ts
rename to src/lib/server/jobs/init.ts
diff --git a/src/jobs/logic/cleanupLogs.ts b/src/lib/server/jobs/logic/cleanupLogs.ts
similarity index 100%
rename from src/jobs/logic/cleanupLogs.ts
rename to src/lib/server/jobs/logic/cleanupLogs.ts
diff --git a/src/jobs/logic/createBackup.ts b/src/lib/server/jobs/logic/createBackup.ts
similarity index 100%
rename from src/jobs/logic/createBackup.ts
rename to src/lib/server/jobs/logic/createBackup.ts
diff --git a/src/jobs/registry.ts b/src/lib/server/jobs/registry.ts
similarity index 100%
rename from src/jobs/registry.ts
rename to src/lib/server/jobs/registry.ts
diff --git a/src/jobs/runner.ts b/src/lib/server/jobs/runner.ts
similarity index 100%
rename from src/jobs/runner.ts
rename to src/lib/server/jobs/runner.ts
diff --git a/src/jobs/scheduler.ts b/src/lib/server/jobs/scheduler.ts
similarity index 100%
rename from src/jobs/scheduler.ts
rename to src/lib/server/jobs/scheduler.ts
diff --git a/src/jobs/types.ts b/src/lib/server/jobs/types.ts
similarity index 100%
rename from src/jobs/types.ts
rename to src/lib/server/jobs/types.ts
diff --git a/src/notifications/NotificationManager.ts b/src/lib/server/notifications/NotificationManager.ts
similarity index 100%
rename from src/notifications/NotificationManager.ts
rename to src/lib/server/notifications/NotificationManager.ts
diff --git a/src/notifications/base/BaseHttpNotifier.ts b/src/lib/server/notifications/base/BaseHttpNotifier.ts
similarity index 100%
rename from src/notifications/base/BaseHttpNotifier.ts
rename to src/lib/server/notifications/base/BaseHttpNotifier.ts
diff --git a/src/notifications/base/Notifier.ts b/src/lib/server/notifications/base/Notifier.ts
similarity index 100%
rename from src/notifications/base/Notifier.ts
rename to src/lib/server/notifications/base/Notifier.ts
diff --git a/src/notifications/notifiers/DiscordNotifier.ts b/src/lib/server/notifications/notifiers/DiscordNotifier.ts
similarity index 100%
rename from src/notifications/notifiers/DiscordNotifier.ts
rename to src/lib/server/notifications/notifiers/DiscordNotifier.ts
diff --git a/src/notifications/notifiers/index.ts b/src/lib/server/notifications/notifiers/index.ts
similarity index 100%
rename from src/notifications/notifiers/index.ts
rename to src/lib/server/notifications/notifiers/index.ts
diff --git a/src/notifications/types.ts b/src/lib/server/notifications/types.ts
similarity index 100%
rename from src/notifications/types.ts
rename to src/lib/server/notifications/types.ts
diff --git a/src/utils/arr/README.md b/src/lib/server/utils/arr/README.md
similarity index 100%
rename from src/utils/arr/README.md
rename to src/lib/server/utils/arr/README.md
diff --git a/src/utils/arr/base.ts b/src/lib/server/utils/arr/base.ts
similarity index 100%
rename from src/utils/arr/base.ts
rename to src/lib/server/utils/arr/base.ts
diff --git a/src/utils/arr/clients/chaptarr.ts b/src/lib/server/utils/arr/clients/chaptarr.ts
similarity index 100%
rename from src/utils/arr/clients/chaptarr.ts
rename to src/lib/server/utils/arr/clients/chaptarr.ts
diff --git a/src/utils/arr/clients/lidarr.ts b/src/lib/server/utils/arr/clients/lidarr.ts
similarity index 100%
rename from src/utils/arr/clients/lidarr.ts
rename to src/lib/server/utils/arr/clients/lidarr.ts
diff --git a/src/utils/arr/clients/radarr.ts b/src/lib/server/utils/arr/clients/radarr.ts
similarity index 100%
rename from src/utils/arr/clients/radarr.ts
rename to src/lib/server/utils/arr/clients/radarr.ts
diff --git a/src/utils/arr/clients/sonarr.ts b/src/lib/server/utils/arr/clients/sonarr.ts
similarity index 100%
rename from src/utils/arr/clients/sonarr.ts
rename to src/lib/server/utils/arr/clients/sonarr.ts
diff --git a/src/utils/arr/factory.ts b/src/lib/server/utils/arr/factory.ts
similarity index 100%
rename from src/utils/arr/factory.ts
rename to src/lib/server/utils/arr/factory.ts
diff --git a/src/utils/arr/types.ts b/src/lib/server/utils/arr/types.ts
similarity index 100%
rename from src/utils/arr/types.ts
rename to src/lib/server/utils/arr/types.ts
diff --git a/src/utils/config/config.ts b/src/lib/server/utils/config/config.ts
similarity index 100%
rename from src/utils/config/config.ts
rename to src/lib/server/utils/config/config.ts
diff --git a/src/utils/http/client.ts b/src/lib/server/utils/http/client.ts
similarity index 100%
rename from src/utils/http/client.ts
rename to src/lib/server/utils/http/client.ts
diff --git a/src/utils/http/types.ts b/src/lib/server/utils/http/types.ts
similarity index 100%
rename from src/utils/http/types.ts
rename to src/lib/server/utils/http/types.ts
diff --git a/src/utils/logger/colors.ts b/src/lib/server/utils/logger/colors.ts
similarity index 100%
rename from src/utils/logger/colors.ts
rename to src/lib/server/utils/logger/colors.ts
diff --git a/src/utils/logger/logger.ts b/src/lib/server/utils/logger/logger.ts
similarity index 100%
rename from src/utils/logger/logger.ts
rename to src/lib/server/utils/logger/logger.ts
diff --git a/src/utils/logger/reader.ts b/src/lib/server/utils/logger/reader.ts
similarity index 100%
rename from src/utils/logger/reader.ts
rename to src/lib/server/utils/logger/reader.ts
diff --git a/src/utils/logger/settings.ts b/src/lib/server/utils/logger/settings.ts
similarity index 100%
rename from src/utils/logger/settings.ts
rename to src/lib/server/utils/logger/settings.ts
diff --git a/src/utils/logger/startup.ts b/src/lib/server/utils/logger/startup.ts
similarity index 100%
rename from src/utils/logger/startup.ts
rename to src/lib/server/utils/logger/startup.ts
diff --git a/src/utils/logger/types.ts b/src/lib/server/utils/logger/types.ts
similarity index 100%
rename from src/utils/logger/types.ts
rename to src/lib/server/utils/logger/types.ts
diff --git a/src/utils/logger/version.ts b/src/lib/shared/version.ts
similarity index 100%
rename from src/utils/logger/version.ts
rename to src/lib/shared/version.ts
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 1ad3c7b..a40cbc6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import '../app.css';
 	import logo from '$assets/logo.svg';
-	import Navbar from '$components/navigation/navbar/navbar.svelte';
-	import PageNav from '$components/navigation/pageNav/pageNav.svelte';
+	import Navbar from '$ui/navigation/navbar/navbar.svelte';
+	import PageNav from '$ui/navigation/pageNav/pageNav.svelte';
 	import AlertContainer from '$alerts/AlertContainer.svelte';
 </script>
 
diff --git a/src/routes/arr/[type]/[id]/edit/+page.svelte b/src/routes/arr/[type]/[id]/edit/+page.svelte
index 5d5b87a..a8052b8 100644
--- a/src/routes/arr/[type]/[id]/edit/+page.svelte
+++ b/src/routes/arr/[type]/[id]/edit/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import ArrInstanceForm from '$components/arr/ArrInstanceForm.svelte';
+	import InstanceForm from '../../../components/InstanceForm.svelte';
 	import type { ActionData, PageData } from './$types';
 
 	export let form: ActionData;
 	export let data: PageData;
 </script>
 
-<ArrInstanceForm mode="edit" {form} instance={data.instance} />
+<InstanceForm mode="edit" {form} instance={data.instance} />
diff --git a/src/components/arr/ArrInstanceForm.svelte b/src/routes/arr/components/InstanceForm.svelte
similarity index 99%
rename from src/components/arr/ArrInstanceForm.svelte
rename to src/routes/arr/components/InstanceForm.svelte
index 78153af..e5fbea8 100644
--- a/src/components/arr/ArrInstanceForm.svelte
+++ b/src/routes/arr/components/InstanceForm.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Check, X, Loader2, Save, Wifi, Trash2 } from 'lucide-svelte';
-	import TagInput from '$components/form/TagInput.svelte';
-	import Modal from '$components/modal/Modal.svelte';
+	import TagInput from '$ui/form/TagInput.svelte';
+	import Modal from '$ui/modal/Modal.svelte';
 	import { enhance } from '$app/forms';
 	import { alertStore } from '$alerts/store';
 	import type { ArrInstance } from '$db/queries/arrInstances.ts';
diff --git a/src/routes/arr/new/+page.svelte b/src/routes/arr/new/+page.svelte
index dc4b268..12666cd 100644
--- a/src/routes/arr/new/+page.svelte
+++ b/src/routes/arr/new/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import ArrInstanceForm from '$components/arr/ArrInstanceForm.svelte';
+	import InstanceForm from './components/InstanceForm.svelte';
 	import type { ActionData } from './$types';
 
 	export let form: ActionData;
@@ -9,4 +9,4 @@
 	const typeFromUrl = $page.url.searchParams.get('type') || '';
 </script>
 
-<ArrInstanceForm mode="create" {form} initialType={typeFromUrl} />
+<InstanceForm mode="create" {form} initialType={typeFromUrl} />
diff --git a/src/routes/settings/backups/+page.server.ts b/src/routes/settings/backups/+page.server.ts
index 6c8cc1f..3be6fc3 100644
--- a/src/routes/settings/backups/+page.server.ts
+++ b/src/routes/settings/backups/+page.server.ts
@@ -2,7 +2,7 @@ import type { Actions, RequestEvent } from '@sveltejs/kit';
 import { fail } from '@sveltejs/kit';
 import { config } from '$config';
 import { logger } from '$logger';
-import { jobScheduler } from '../../../jobs/scheduler.ts';
+import { jobScheduler } from '$jobs/scheduler.ts';
 
 interface BackupFile {
 	filename: string;
diff --git a/src/routes/settings/backups/+page.svelte b/src/routes/settings/backups/+page.svelte
index 6eef2d0..ef63711 100644
--- a/src/routes/settings/backups/+page.svelte
+++ b/src/routes/settings/backups/+page.svelte
@@ -2,7 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { alertStore } from '$alerts/store';
 	import { Download, Plus, Trash2, RotateCcw, Database, Upload } from 'lucide-svelte';
-	import Modal from '$components/modal/Modal.svelte';
+	import Modal from '$ui/modal/Modal.svelte';
 	import type { PageData } from './$types';
 
 	export let data: PageData;
diff --git a/src/routes/settings/general/components/BackupSettings.svelte b/src/routes/settings/general/components/BackupSettings.svelte
index eaf59a5..b07209d 100644
--- a/src/routes/settings/general/components/BackupSettings.svelte
+++ b/src/routes/settings/general/components/BackupSettings.svelte
@@ -2,7 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { alertStore } from '$alerts/store';
 	import { Save } from 'lucide-svelte';
-	import NumberInput from '$components/form/NumberInput.svelte';
+	import NumberInput from '$ui/form/NumberInput.svelte';
 	import type { BackupSettings } from './types';
 
 	export let settings: BackupSettings;
diff --git a/src/routes/settings/general/components/LoggingSettings.svelte b/src/routes/settings/general/components/LoggingSettings.svelte
index ef1fcc3..4133952 100644
--- a/src/routes/settings/general/components/LoggingSettings.svelte
+++ b/src/routes/settings/general/components/LoggingSettings.svelte
@@ -2,7 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { alertStore } from '$alerts/store';
 	import { Save, RotateCcw } from 'lucide-svelte';
-	import NumberInput from '$components/form/NumberInput.svelte';
+	import NumberInput from '$ui/form/NumberInput.svelte';
 	import type { LogSettings } from './types';
 
 	export let settings: LogSettings;
diff --git a/src/routes/settings/jobs/+page.server.ts b/src/routes/settings/jobs/+page.server.ts
index a804736..6c989d4 100644
--- a/src/routes/settings/jobs/+page.server.ts
+++ b/src/routes/settings/jobs/+page.server.ts
@@ -1,7 +1,7 @@
 import type { Actions, RequestEvent } from '@sveltejs/kit';
 import { fail } from '@sveltejs/kit';
 import { jobsQueries, jobRunsQueries } from '$db/queries/jobs.ts';
-import { jobScheduler } from '../../../jobs/scheduler.ts';
+import { jobScheduler } from '$jobs/scheduler.ts';
 import { logger } from '$logger';
 
 // Helper to format schedule for display
diff --git a/src/routes/settings/logs/+page.svelte b/src/routes/settings/logs/+page.svelte
index 356e824..101b4ca 100644
--- a/src/routes/settings/logs/+page.svelte
+++ b/src/routes/settings/logs/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Search, Download, RefreshCw, Eye, Copy } from 'lucide-svelte';
 	import { alertStore } from '$alerts/store';
-	import Modal from '$components/modal/Modal.svelte';
+	import Modal from '$ui/modal/Modal.svelte';
 	import type { PageData } from './$types';
 
 	export let data: PageData;
diff --git a/src/routes/settings/notifications/+page.svelte b/src/routes/settings/notifications/+page.svelte
index bc75160..c5272a5 100644
--- a/src/routes/settings/notifications/+page.svelte
+++ b/src/routes/settings/notifications/+page.svelte
@@ -4,8 +4,8 @@
 	import { enhance } from '$app/forms';
 	import { alertStore } from '$alerts/store';
 	import { Plus, Trash2, Bell, BellOff, MessageSquare, Send, Loader2, Pencil } from 'lucide-svelte';
-	import Modal from '$components/modal/Modal.svelte';
-	import NotificationHistory from '$components/notifications/NotificationHistory.svelte';
+	import Modal from '$ui/modal/Modal.svelte';
+	import NotificationHistory from './components/NotificationHistory.svelte';
 	import { siDiscord } from 'simple-icons';
 	import type { PageData } from './$types';
 
diff --git a/src/components/notifications/DiscordConfiguration.svelte b/src/routes/settings/notifications/components/DiscordConfiguration.svelte
similarity index 100%
rename from src/components/notifications/DiscordConfiguration.svelte
rename to src/routes/settings/notifications/components/DiscordConfiguration.svelte
diff --git a/src/components/notifications/NotificationHistory.svelte b/src/routes/settings/notifications/components/NotificationHistory.svelte
similarity index 100%
rename from src/components/notifications/NotificationHistory.svelte
rename to src/routes/settings/notifications/components/NotificationHistory.svelte
diff --git a/src/components/notifications/NotificationServiceForm.svelte b/src/routes/settings/notifications/components/NotificationServiceForm.svelte
similarity index 100%
rename from src/components/notifications/NotificationServiceForm.svelte
rename to src/routes/settings/notifications/components/NotificationServiceForm.svelte
diff --git a/src/routes/settings/notifications/edit/[id]/+page.svelte b/src/routes/settings/notifications/edit/[id]/+page.svelte
index d78fed1..7ac3af7 100644
--- a/src/routes/settings/notifications/edit/[id]/+page.svelte
+++ b/src/routes/settings/notifications/edit/[id]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ArrowLeft } from 'lucide-svelte';
-	import NotificationServiceForm from '$components/notifications/NotificationServiceForm.svelte';
+	import NotificationServiceForm from '../../components/NotificationServiceForm.svelte';
 	import type { PageData } from './$types';
 
 	export let data: PageData;
diff --git a/src/routes/settings/notifications/new/+page.svelte b/src/routes/settings/notifications/new/+page.svelte
index df9857f..17598b4 100644
--- a/src/routes/settings/notifications/new/+page.svelte
+++ b/src/routes/settings/notifications/new/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ArrowLeft } from 'lucide-svelte';
-	import NotificationServiceForm from '$components/notifications/NotificationServiceForm.svelte';
+	import NotificationServiceForm from '../components/NotificationServiceForm.svelte';
 </script>
 
 <div class="p-8">
diff --git a/svelte.config.js b/svelte.config.js
index 237ea20..0fc74ad 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -10,19 +10,21 @@ const config = {
 			usage: 'deno-compile'
 		}),
 		alias: {
-			$config: './src/utils/config/config.ts',
-			$logger: './src/utils/logger/logger.ts',
-			'$logger/*': './src/utils/logger/*',
+			$config: './src/lib/server/utils/config/config.ts',
+			$logger: './src/lib/server/utils/logger/logger.ts',
+			'$logger/*': './src/lib/server/utils/logger/*',
+			$shared: './src/lib/shared',
 			$stores: './src/lib/client/stores',
-			$components: './src/components',
+			$ui: './src/lib/client/ui',
 			$assets: './src/lib/client/assets',
 			$alerts: './src/lib/client/alerts',
 			$server: './src/server',
-			$db: './src/db',
-			$arr: './src/utils/arr',
-			$http: './src/utils/http',
-			$utils: './src/utils',
-			$notifications: './src/notifications',
+			$db: './src/lib/server/db',
+			$jobs: './src/lib/server/jobs',
+			$arr: './src/lib/server/utils/arr',
+			$http: './src/lib/server/utils/http',
+			$utils: './src/lib/server/utils',
+			$notifications: './src/lib/server/notifications',
 		}
 	}
 };