diff --git a/web/src/lib/sidebars/AdminSidebar.svelte b/web/src/lib/components/AdminSidebar.svelte
similarity index 100%
rename from web/src/lib/sidebars/AdminSidebar.svelte
rename to web/src/lib/components/AdminSidebar.svelte
diff --git a/web/src/lib/components/layouts/AdminPageLayout.svelte b/web/src/lib/components/layouts/AdminPageLayout.svelte
index d63e306853..6a0d6508dc 100644
--- a/web/src/lib/components/layouts/AdminPageLayout.svelte
+++ b/web/src/lib/components/layouts/AdminPageLayout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import PageContent from '$lib/components/layouts/PageContent.svelte';
   import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
-  import AdminSidebar from '$lib/sidebars/AdminSidebar.svelte';
+  import AdminSidebar from '$lib/components/AdminSidebar.svelte';
   import { sidebarStore } from '$lib/stores/sidebar.svelte';
   import type { HeaderButtonActionItem } from '$lib/types';
   import {
diff --git a/web/src/lib/components/onboarding-page/onboarding-hello.svelte b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
index 3fb89501b6..d05e5e19ed 100644
--- a/web/src/lib/components/onboarding-page/onboarding-hello.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
-  import { OnboardingRole } from '$lib/models/onboarding-role';
   import { user } from '$lib/stores/user.store';
+  import { OnboardingRole } from '$lib/types';
   import { Logo } from '@immich/ui';
   import { t } from 'svelte-i18n';
 
diff --git a/web/src/lib/components/shared-components/upload-asset-preview.svelte b/web/src/lib/components/shared-components/upload-asset-preview.svelte
index 597e48c75a..95a381f68a 100644
--- a/web/src/lib/components/shared-components/upload-asset-preview.svelte
+++ b/web/src/lib/components/shared-components/upload-asset-preview.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { AppRoute } from '$lib/constants';
-  import type { UploadAsset } from '$lib/models/upload-asset';
-  import { UploadState } from '$lib/models/upload-asset';
   import { locale } from '$lib/stores/preferences.store';
   import { uploadAssetsStore } from '$lib/stores/upload';
+  import type { UploadAsset } from '$lib/types';
+  import { UploadState } from '$lib/types';
   import { getByteUnitString } from '$lib/utils/byte-units';
   import { fileUploadHandler } from '$lib/utils/file-uploader';
   import { Icon } from '@immich/ui';
diff --git a/web/src/lib/models/onboarding-role.ts b/web/src/lib/models/onboarding-role.ts
deleted file mode 100644
index 4efc307932..0000000000
--- a/web/src/lib/models/onboarding-role.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum OnboardingRole {
-  SERVER = 'server',
-  USER = 'user',
-}
diff --git a/web/src/lib/models/upload-asset.ts b/web/src/lib/models/upload-asset.ts
deleted file mode 100644
index 9d61010d5d..0000000000
--- a/web/src/lib/models/upload-asset.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export enum UploadState {
-  PENDING,
-  STARTED,
-  DONE,
-  ERROR,
-  DUPLICATED,
-}
-
-export type UploadAsset = {
-  id: string;
-  file: File;
-  assetId?: string;
-  isTrashed?: boolean;
-  albumId?: string;
-  progress?: number;
-  state?: UploadState;
-  startDate?: number;
-  eta?: number;
-  speed?: number;
-  error?: unknown;
-  message?: string;
-};
diff --git a/web/src/lib/stores/upload.ts b/web/src/lib/stores/upload.ts
index 4bf597b932..8e775b7b79 100644
--- a/web/src/lib/stores/upload.ts
+++ b/web/src/lib/stores/upload.ts
@@ -1,5 +1,5 @@
+import { UploadState, type UploadAsset } from '$lib/types';
 import { derived, writable } from 'svelte/store';
-import { UploadState, type UploadAsset } from '../models/upload-asset';
 
 function createUploadStore() {
   const uploadAssets = writable<Array<UploadAsset>>([]);
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
index dbe3c851a0..134ac17b60 100644
--- a/web/src/lib/types.ts
+++ b/web/src/lib/types.ts
@@ -12,3 +12,31 @@ export interface ReleaseEvent {
 export type QueueSnapshot = { timestamp: number; snapshot?: QueueResponseDto[] };
 
 export type HeaderButtonActionItem = ActionItem & { data?: { title?: string } };
+
+export enum UploadState {
+  PENDING,
+  STARTED,
+  DONE,
+  ERROR,
+  DUPLICATED,
+}
+
+export type UploadAsset = {
+  id: string;
+  file: File;
+  assetId?: string;
+  isTrashed?: boolean;
+  albumId?: string;
+  progress?: number;
+  state?: UploadState;
+  startDate?: number;
+  eta?: number;
+  speed?: number;
+  error?: unknown;
+  message?: string;
+};
+
+export enum OnboardingRole {
+  SERVER = 'server',
+  USER = 'user',
+}
diff --git a/web/src/lib/utils/file-uploader.ts b/web/src/lib/utils/file-uploader.ts
index 516d682625..62e81762a7 100644
--- a/web/src/lib/utils/file-uploader.ts
+++ b/web/src/lib/utils/file-uploader.ts
@@ -1,8 +1,8 @@
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { uploadManager } from '$lib/managers/upload-manager.svelte';
-import { UploadState } from '$lib/models/upload-asset';
 import { uploadAssetsStore } from '$lib/stores/upload';
 import { user } from '$lib/stores/user.store';
+import { UploadState } from '$lib/types';
 import { uploadRequest } from '$lib/utils';
 import { addAssetsToAlbum } from '$lib/utils/asset-utils';
 import { ExecutorQueue } from '$lib/utils/executor-queue';
diff --git a/web/src/routes/auth/onboarding/+page.svelte b/web/src/routes/auth/onboarding/+page.svelte
index ed4235104c..c75e31bb9a 100644
--- a/web/src/routes/auth/onboarding/+page.svelte
+++ b/web/src/routes/auth/onboarding/+page.svelte
@@ -13,8 +13,8 @@
   import { AppRoute, QueryParameter } from '$lib/constants';
   import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
   import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
-  import { OnboardingRole } from '$lib/models/onboarding-role';
   import { user } from '$lib/stores/user.store';
+  import { OnboardingRole } from '$lib/types';
   import { setUserOnboarding, updateAdminOnboarding } from '@immich/sdk';
   import {
     mdiCellphoneArrowDownVariant,