diff --git a/web/src/routes/(user)/+layout.svelte b/web/src/routes/(user)/+layout.svelte
index 983d25eced..3e71097096 100644
--- a/web/src/routes/(user)/+layout.svelte
+++ b/web/src/routes/(user)/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from '$app/state';
-  import UploadCover from '$lib/components/shared-components/drag-and-drop-upload-overlay.svelte';
+  import UploadCover from './drag-and-drop-upload-overlay.svelte';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import type { Snippet } from 'svelte';
   interface Props {
diff --git a/web/src/routes/(user)/albums/+page.svelte b/web/src/routes/(user)/albums/+page.svelte
index e4c7d7673b..193b871040 100644
--- a/web/src/routes/(user)/albums/+page.svelte
+++ b/web/src/routes/(user)/albums/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { scrollMemory } from '$lib/actions/scroll-memory';
-  import AlbumsControls from '$lib/components/album-page/albums-controls.svelte';
+  import AlbumsControls from './albums-controls.svelte';
   import Albums from '$lib/components/album-page/albums-list.svelte';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
diff --git a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index dc3a7b60d4..4719b49689 100644
--- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { goto, onNavigate } from '$app/navigation';
   import { scrollMemoryClearer } from '$lib/actions/scroll-memory';
-  import AlbumDescription from '$lib/components/album-page/album-description.svelte';
+  import AlbumDescription from './album-description.svelte';
   import AlbumMap from '$lib/components/album-page/album-map.svelte';
   import AlbumSummary from '$lib/components/album-page/album-summary.svelte';
-  import AlbumTitle from '$lib/components/album-page/album-title.svelte';
+  import AlbumTitle from './album-title.svelte';
   import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte';
   import ActivityViewer from '$lib/components/asset-viewer/activity-viewer.svelte';
   import HeaderActionButton from '$lib/components/HeaderActionButton.svelte';
diff --git a/web/src/lib/components/album-page/album-description.spec.ts b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-description.spec.ts
similarity index 89%
rename from web/src/lib/components/album-page/album-description.spec.ts
rename to web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-description.spec.ts
index 1c069de2bc..3f552fb340 100644
--- a/web/src/lib/components/album-page/album-description.spec.ts
+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-description.spec.ts
@@ -1,7 +1,7 @@
-import AlbumDescription from '$lib/components/album-page/album-description.svelte';
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/svelte';
 import { describe } from 'vitest';
+import AlbumDescription from './album-description.svelte';
 
 describe('AlbumDescription component', () => {
   it('shows an AutogrowTextarea component when isOwned is true', () => {
diff --git a/web/src/lib/components/album-page/album-description.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-description.svelte
similarity index 100%
rename from web/src/lib/components/album-page/album-description.svelte
rename to web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-description.svelte
diff --git a/web/src/lib/components/album-page/album-title.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-title.svelte
similarity index 100%
rename from web/src/lib/components/album-page/album-title.svelte
rename to web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/album-title.svelte
diff --git a/web/src/lib/components/album-page/albums-controls.svelte b/web/src/routes/(user)/albums/albums-controls.svelte
similarity index 100%
rename from web/src/lib/components/album-page/albums-controls.svelte
rename to web/src/routes/(user)/albums/albums-controls.svelte
diff --git a/web/src/routes/(user)/buy/+page.svelte b/web/src/routes/(user)/buy/+page.svelte
index 111548ba3b..581a31b2bd 100644
--- a/web/src/routes/(user)/buy/+page.svelte
+++ b/web/src/routes/(user)/buy/+page.svelte
@@ -3,7 +3,7 @@
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import LicenseActivationSuccess from '$lib/components/shared-components/purchasing/purchase-activation-success.svelte';
   import LicenseContent from '$lib/components/shared-components/purchasing/purchase-content.svelte';
-  import SupporterBadge from '$lib/components/shared-components/side-bar/supporter-badge.svelte';
+  import SupporterBadge from './supporter-badge.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { Route } from '$lib/route';
   import { Alert, Container, Stack } from '@immich/ui';
diff --git a/web/src/lib/components/shared-components/side-bar/supporter-badge.svelte b/web/src/routes/(user)/buy/supporter-badge.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/side-bar/supporter-badge.svelte
rename to web/src/routes/(user)/buy/supporter-badge.svelte
diff --git a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte b/web/src/routes/(user)/drag-and-drop-upload-overlay.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
rename to web/src/routes/(user)/drag-and-drop-upload-overlay.svelte
diff --git a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 84ba42088d..5a8391bb9a 100644
--- a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import MapTimelinePanel from '$lib/components/shared-components/map/MapTimelinePanel.svelte';
+  import MapTimelinePanel from './MapTimelinePanel.svelte';
   import type { SelectionBBox } from '$lib/components/shared-components/map/types';
   import { timeToLoadTheMap } from '$lib/constants';
   import Portal from '$lib/elements/Portal.svelte';
diff --git a/web/src/lib/components/shared-components/map/MapTimelinePanel.svelte b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/map/MapTimelinePanel.svelte
rename to web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte
diff --git a/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 7f34913224..f971ab60b6 100644
--- a/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import MemoryViewer from '$lib/components/memory-page/memory-viewer.svelte';
+  import MemoryViewer from './memory-viewer.svelte';
 </script>
 
 <MemoryViewer />
diff --git a/web/src/lib/components/memory-page/memory-photo-viewer.svelte b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-photo-viewer.svelte
similarity index 100%
rename from web/src/lib/components/memory-page/memory-photo-viewer.svelte
rename to web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-photo-viewer.svelte
diff --git a/web/src/lib/components/memory-page/memory-video-viewer.svelte b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-video-viewer.svelte
similarity index 100%
rename from web/src/lib/components/memory-page/memory-video-viewer.svelte
rename to web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-video-viewer.svelte
diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-viewer.svelte
similarity index 99%
rename from web/src/lib/components/memory-page/memory-viewer.svelte
rename to web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-viewer.svelte
index 0b6f89ec5c..7c0693badb 100644
--- a/web/src/lib/components/memory-page/memory-viewer.svelte
+++ b/web/src/routes/(user)/memory/[[photos=photos]]/[[assetId=id]]/memory-viewer.svelte
@@ -2,8 +2,8 @@
   import { afterNavigate, goto } from '$app/navigation';
   import { page } from '$app/state';
   import { shortcuts } from '$lib/actions/shortcut';
-  import MemoryPhotoViewer from '$lib/components/memory-page/memory-photo-viewer.svelte';
-  import MemoryVideoViewer from '$lib/components/memory-page/memory-video-viewer.svelte';
+  import MemoryPhotoViewer from './memory-photo-viewer.svelte';
+  import MemoryVideoViewer from './memory-video-viewer.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
diff --git a/web/src/routes/(user)/people/+page.svelte b/web/src/routes/(user)/people/+page.svelte
index 0bc2439efe..c6e445f7d8 100644
--- a/web/src/routes/(user)/people/+page.svelte
+++ b/web/src/routes/(user)/people/+page.svelte
@@ -3,9 +3,9 @@
   import { page } from '$app/stores';
   import { scrollMemory } from '$lib/actions/scroll-memory';
   import { shortcut } from '$lib/actions/shortcut';
-  import ManagePeopleVisibility from '$lib/components/faces-page/manage-people-visibility.svelte';
-  import PeopleCard from '$lib/components/faces-page/people-card.svelte';
-  import PeopleInfiniteScroll from '$lib/components/faces-page/people-infinite-scroll.svelte';
+  import ManagePeopleVisibility from './manage-people-visibility.svelte';
+  import PeopleCard from './people-card.svelte';
+  import PeopleInfiniteScroll from './people-infinite-scroll.svelte';
   import SearchPeople from '$lib/components/faces-page/people-search.svelte';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
index b167f93a08..67b6f3c1ac 100644
--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -5,9 +5,9 @@
   import { listNavigation } from '$lib/actions/list-navigation';
   import { scrollMemoryClearer } from '$lib/actions/scroll-memory';
   import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
-  import EditNameInput from '$lib/components/faces-page/edit-name-input.svelte';
-  import MergeFaceSelector from '$lib/components/faces-page/merge-face-selector.svelte';
-  import UnMergeFaceSelector from '$lib/components/faces-page/unmerge-face-selector.svelte';
+  import EditNameInput from './edit-name-input.svelte';
+  import MergeFaceSelector from './merge-face-selector.svelte';
+  import UnMergeFaceSelector from './unmerge-face-selector.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
diff --git a/web/src/lib/components/faces-page/edit-name-input.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/edit-name-input.svelte
similarity index 94%
rename from web/src/lib/components/faces-page/edit-name-input.svelte
rename to web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/edit-name-input.svelte
index 36471923f1..5db57444e5 100644
--- a/web/src/lib/components/faces-page/edit-name-input.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/edit-name-input.svelte
@@ -3,7 +3,7 @@
   import { type PersonResponseDto } from '@immich/sdk';
   import { Button } from '@immich/ui';
   import { t } from 'svelte-i18n';
-  import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
+  import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
 
   interface Props {
     person: PersonResponseDto;
diff --git a/web/src/lib/components/faces-page/face-thumbnail.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/face-thumbnail.svelte
similarity index 95%
rename from web/src/lib/components/faces-page/face-thumbnail.svelte
rename to web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/face-thumbnail.svelte
index 196777f0af..135b181be1 100644
--- a/web/src/lib/components/faces-page/face-thumbnail.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/face-thumbnail.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { getPeopleThumbnailUrl } from '$lib/utils';
   import { type PersonResponseDto } from '@immich/sdk';
-  import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
+  import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
 
   interface Props {
     person: PersonResponseDto;
diff --git a/web/src/lib/components/faces-page/merge-face-selector.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/merge-face-selector.svelte
similarity index 98%
rename from web/src/lib/components/faces-page/merge-face-selector.svelte
rename to web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/merge-face-selector.svelte
index 55be17c535..37055b13cb 100644
--- a/web/src/lib/components/faces-page/merge-face-selector.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/merge-face-selector.svelte
@@ -10,7 +10,7 @@
   import { flip } from 'svelte/animate';
   import { quintOut } from 'svelte/easing';
   import { fly } from 'svelte/transition';
-  import ControlAppBar from '../shared-components/control-app-bar.svelte';
+  import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
   import FaceThumbnail from './face-thumbnail.svelte';
   import PeopleList from './people-list.svelte';
 
diff --git a/web/src/lib/components/faces-page/people-list.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/people-list.svelte
similarity index 100%
rename from web/src/lib/components/faces-page/people-list.svelte
rename to web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/people-list.svelte
diff --git a/web/src/lib/components/faces-page/unmerge-face-selector.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/unmerge-face-selector.svelte
similarity index 98%
rename from web/src/lib/components/faces-page/unmerge-face-selector.svelte
rename to web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/unmerge-face-selector.svelte
index 735e7a450a..90347c8898 100644
--- a/web/src/lib/components/faces-page/unmerge-face-selector.svelte
+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/unmerge-face-selector.svelte
@@ -14,7 +14,7 @@
   import { t } from 'svelte-i18n';
   import { quintOut } from 'svelte/easing';
   import { fly } from 'svelte/transition';
-  import ControlAppBar from '../shared-components/control-app-bar.svelte';
+  import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
   import FaceThumbnail from './face-thumbnail.svelte';
   import PeopleList from './people-list.svelte';
 
diff --git a/web/src/lib/components/faces-page/manage-people-visibility.spec.ts b/web/src/routes/(user)/people/manage-people-visibility.spec.ts
similarity index 100%
rename from web/src/lib/components/faces-page/manage-people-visibility.spec.ts
rename to web/src/routes/(user)/people/manage-people-visibility.spec.ts
diff --git a/web/src/lib/components/faces-page/manage-people-visibility.svelte b/web/src/routes/(user)/people/manage-people-visibility.svelte
similarity index 98%
rename from web/src/lib/components/faces-page/manage-people-visibility.svelte
rename to web/src/routes/(user)/people/manage-people-visibility.svelte
index f47b4b0921..13ebf102b0 100644
--- a/web/src/lib/components/faces-page/manage-people-visibility.svelte
+++ b/web/src/routes/(user)/people/manage-people-visibility.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { shortcut } from '$lib/actions/shortcut';
   import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
-  import PeopleInfiniteScroll from '$lib/components/faces-page/people-infinite-scroll.svelte';
+  import PeopleInfiniteScroll from './people-infinite-scroll.svelte';
   import { ToggleVisibility } from '$lib/constants';
   import { locale } from '$lib/stores/preferences.store';
   import { getPeopleThumbnailUrl } from '$lib/utils';
diff --git a/web/src/lib/components/faces-page/manage-people-visibility.test-wrapper.svelte b/web/src/routes/(user)/people/manage-people-visibility.test-wrapper.svelte
similarity index 100%
rename from web/src/lib/components/faces-page/manage-people-visibility.test-wrapper.svelte
rename to web/src/routes/(user)/people/manage-people-visibility.test-wrapper.svelte
diff --git a/web/src/lib/components/faces-page/people-card.svelte b/web/src/routes/(user)/people/people-card.svelte
similarity index 93%
rename from web/src/lib/components/faces-page/people-card.svelte
rename to web/src/routes/(user)/people/people-card.svelte
index ef712443ed..ee4bc02fab 100644
--- a/web/src/lib/components/faces-page/people-card.svelte
+++ b/web/src/routes/(user)/people/people-card.svelte
@@ -16,8 +16,8 @@
     mdiHeartOutline,
   } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
-  import MenuOption from '../shared-components/context-menu/menu-option.svelte';
+  import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
+  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
 
   type Props = {
     person: PersonResponseDto;
diff --git a/web/src/lib/components/faces-page/people-infinite-scroll.svelte b/web/src/routes/(user)/people/people-infinite-scroll.svelte
similarity index 100%
rename from web/src/lib/components/faces-page/people-infinite-scroll.svelte
rename to web/src/routes/(user)/people/people-infinite-scroll.svelte
diff --git a/web/src/routes/(user)/places/+page.svelte b/web/src/routes/(user)/places/+page.svelte
index 636f28013f..e4d6234763 100644
--- a/web/src/routes/(user)/places/+page.svelte
+++ b/web/src/routes/(user)/places/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import PlacesControls from '$lib/components/places-page/places-controls.svelte';
+  import PlacesControls from './places-controls.svelte';
   import type { PageData } from './$types';
   import { type AssetResponseDto } from '@immich/sdk';
   import { t } from 'svelte-i18n';
   import { locale } from '$lib/stores/preferences.store';
-  import Places from '$lib/components/places-page/places-list.svelte';
+  import Places from './places-list.svelte';
   import { placesViewSettings } from '$lib/stores/preferences.store';
 
   interface Props {
diff --git a/web/src/lib/components/places-page/places-card-group.svelte b/web/src/routes/(user)/places/places-card-group.svelte
similarity index 100%
rename from web/src/lib/components/places-page/places-card-group.svelte
rename to web/src/routes/(user)/places/places-card-group.svelte
diff --git a/web/src/lib/components/places-page/places-controls.svelte b/web/src/routes/(user)/places/places-controls.svelte
similarity index 100%
rename from web/src/lib/components/places-page/places-controls.svelte
rename to web/src/routes/(user)/places/places-controls.svelte
diff --git a/web/src/lib/components/places-page/places-list.svelte b/web/src/routes/(user)/places/places-list.svelte
similarity index 100%
rename from web/src/lib/components/places-page/places-list.svelte
rename to web/src/routes/(user)/places/places-list.svelte
diff --git a/web/src/routes/(user)/shared-links/(list)/+layout.svelte b/web/src/routes/(user)/shared-links/(list)/+layout.svelte
index 881a098255..8f36b04c67 100644
--- a/web/src/routes/(user)/shared-links/(list)/+layout.svelte
+++ b/web/src/routes/(user)/shared-links/(list)/+layout.svelte
@@ -3,7 +3,7 @@
   import { page } from '$app/state';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import SharedLinkCard from '$lib/components/sharedlinks-page/SharedLinkCard.svelte';
+  import SharedLinkCard from './SharedLinkCard.svelte';
   import { type SharedLinkTab } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
   import { Route } from '$lib/route';
diff --git a/web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte b/web/src/routes/(user)/shared-links/(list)/SharedLinkCard.svelte
similarity index 97%
rename from web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte
rename to web/src/routes/(user)/shared-links/(list)/SharedLinkCard.svelte
index f552efd148..7262447894 100644
--- a/web/src/lib/components/sharedlinks-page/SharedLinkCard.svelte
+++ b/web/src/routes/(user)/shared-links/(list)/SharedLinkCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ShareCover from '$lib/components/sharedlinks-page/covers/share-cover.svelte';
+  import ShareCover from './share-cover.svelte';
   import { Route } from '$lib/route';
   import { getSharedLinkActions } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
diff --git a/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts b/web/src/routes/(user)/shared-links/(list)/share-cover.spec.ts
similarity index 96%
rename from web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts
rename to web/src/routes/(user)/shared-links/(list)/share-cover.spec.ts
index f6830e6bc2..76ebcf860a 100644
--- a/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts
+++ b/web/src/routes/(user)/shared-links/(list)/share-cover.spec.ts
@@ -1,9 +1,9 @@
-import ShareCover from '$lib/components/sharedlinks-page/covers/share-cover.svelte';
 import { getAssetMediaUrl } from '$lib/utils';
 import { albumFactory } from '@test-data/factories/album-factory';
 import { assetFactory } from '@test-data/factories/asset-factory';
 import { sharedLinkFactory } from '@test-data/factories/shared-link-factory';
 import { render, screen } from '@testing-library/svelte';
+import ShareCover from './share-cover.svelte';
 
 vi.mock('$lib/utils');
 
diff --git a/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte b/web/src/routes/(user)/shared-links/(list)/share-cover.svelte
similarity index 100%
rename from web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
rename to web/src/routes/(user)/shared-links/(list)/share-cover.svelte
diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 18b793c566..3f269875fa 100644
--- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -4,7 +4,7 @@
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import DeleteAssets from '$lib/components/timeline/actions/DeleteAssetsAction.svelte';
-  import RestoreAssets from '$lib/components/timeline/actions/RestoreAction.svelte';
+  import RestoreAssets from './RestoreAction.svelte';
   import SelectAllAssets from '$lib/components/timeline/actions/SelectAllAction.svelte';
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import Timeline from '$lib/components/timeline/Timeline.svelte';
diff --git a/web/src/lib/components/timeline/actions/RestoreAction.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/RestoreAction.svelte
similarity index 100%
rename from web/src/lib/components/timeline/actions/RestoreAction.svelte
rename to web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/RestoreAction.svelte
diff --git a/web/src/routes/(user)/user-settings/+page.svelte b/web/src/routes/(user)/user-settings/+page.svelte
index bf4f5b00f1..1ce261af5b 100644
--- a/web/src/routes/(user)/user-settings/+page.svelte
+++ b/web/src/routes/(user)/user-settings/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import UserSettingsList from '$lib/components/user-settings-page/user-settings-list.svelte';
+  import UserSettingsList from './user-settings-list.svelte';
   import { getKeyboardActions } from '$lib/services/keyboard.service';
   import { Container } from '@immich/ui';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte b/web/src/routes/(user)/user-settings/PinCodeChangeForm.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte
rename to web/src/routes/(user)/user-settings/PinCodeChangeForm.svelte
diff --git a/web/src/lib/components/user-settings-page/PinCodeSettings.svelte b/web/src/routes/(user)/user-settings/PinCodeSettings.svelte
similarity index 89%
rename from web/src/lib/components/user-settings-page/PinCodeSettings.svelte
rename to web/src/routes/(user)/user-settings/PinCodeSettings.svelte
index 53530b694d..1ad3021b7a 100644
--- a/web/src/lib/components/user-settings-page/PinCodeSettings.svelte
+++ b/web/src/routes/(user)/user-settings/PinCodeSettings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import PinCodeChangeForm from '$lib/components/user-settings-page/PinCodeChangeForm.svelte';
+  import PinCodeChangeForm from './PinCodeChangeForm.svelte';
   import PinCodeCreateForm from '$lib/components/user-settings-page/PinCodeCreateForm.svelte';
   import { getAuthStatus } from '@immich/sdk';
   import { onMount } from 'svelte';
diff --git a/web/src/lib/components/user-settings-page/app-settings.svelte b/web/src/routes/(user)/user-settings/app-settings.svelte
similarity index 97%
rename from web/src/lib/components/user-settings-page/app-settings.svelte
rename to web/src/routes/(user)/user-settings/app-settings.svelte
index 4fd75203ce..49498da431 100644
--- a/web/src/lib/components/user-settings-page/app-settings.svelte
+++ b/web/src/routes/(user)/user-settings/app-settings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ComboBoxOption } from '$lib/components/shared-components/combobox.svelte';
-  import SettingCombobox from '$lib/components/shared-components/settings/setting-combobox.svelte';
+  import SettingCombobox from './setting-combobox.svelte';
   import SettingsLanguageSelector from '$lib/components/shared-components/settings/settings-language-selector.svelte';
   import { fallbackLocale, locales } from '$lib/constants';
   import {
diff --git a/web/src/lib/components/user-settings-page/change-password-settings.svelte b/web/src/routes/(user)/user-settings/change-password-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/change-password-settings.svelte
rename to web/src/routes/(user)/user-settings/change-password-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/device-list.svelte b/web/src/routes/(user)/user-settings/device-list.svelte
similarity index 97%
rename from web/src/lib/components/user-settings-page/device-list.svelte
rename to web/src/routes/(user)/user-settings/device-list.svelte
index 003eb03224..891452772a 100644
--- a/web/src/lib/components/user-settings-page/device-list.svelte
+++ b/web/src/routes/(user)/user-settings/device-list.svelte
@@ -4,7 +4,7 @@
   import { Button, modalManager, Text, toastManager } from '@immich/ui';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import DeviceCard from './device-card.svelte';
+  import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
 
   interface Props {
     devices: SessionResponseDto[];
diff --git a/web/src/lib/components/user-settings-page/download-settings.svelte b/web/src/routes/(user)/user-settings/download-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/download-settings.svelte
rename to web/src/routes/(user)/user-settings/download-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/feature-settings.svelte b/web/src/routes/(user)/user-settings/feature-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/feature-settings.svelte
rename to web/src/routes/(user)/user-settings/feature-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/notifications-settings.svelte b/web/src/routes/(user)/user-settings/notifications-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/notifications-settings.svelte
rename to web/src/routes/(user)/user-settings/notifications-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/oauth-settings.svelte b/web/src/routes/(user)/user-settings/oauth-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/oauth-settings.svelte
rename to web/src/routes/(user)/user-settings/oauth-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/partner-settings.svelte b/web/src/routes/(user)/user-settings/partner-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/partner-settings.svelte
rename to web/src/routes/(user)/user-settings/partner-settings.svelte
diff --git a/web/src/lib/components/shared-components/settings/setting-combobox.svelte b/web/src/routes/(user)/user-settings/setting-combobox.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/settings/setting-combobox.svelte
rename to web/src/routes/(user)/user-settings/setting-combobox.svelte
diff --git a/web/src/lib/components/user-settings-page/user-api-key-list.svelte b/web/src/routes/(user)/user-settings/user-api-key-list.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/user-api-key-list.svelte
rename to web/src/routes/(user)/user-settings/user-api-key-list.svelte
diff --git a/web/src/lib/components/user-settings-page/user-profile-settings.svelte b/web/src/routes/(user)/user-settings/user-profile-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/user-profile-settings.svelte
rename to web/src/routes/(user)/user-settings/user-profile-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte b/web/src/routes/(user)/user-settings/user-purchase-settings.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/user-purchase-settings.svelte
rename to web/src/routes/(user)/user-settings/user-purchase-settings.svelte
diff --git a/web/src/lib/components/user-settings-page/user-settings-list.svelte b/web/src/routes/(user)/user-settings/user-settings-list.svelte
similarity index 84%
rename from web/src/lib/components/user-settings-page/user-settings-list.svelte
rename to web/src/routes/(user)/user-settings/user-settings-list.svelte
index dced7fd5ba..835961a46d 100644
--- a/web/src/lib/components/user-settings-page/user-settings-list.svelte
+++ b/web/src/routes/(user)/user-settings/user-settings-list.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { page } from '$app/stores';
-  import ChangePinCodeSettings from '$lib/components/user-settings-page/PinCodeSettings.svelte';
-  import DownloadSettings from '$lib/components/user-settings-page/download-settings.svelte';
-  import FeatureSettings from '$lib/components/user-settings-page/feature-settings.svelte';
-  import NotificationsSettings from '$lib/components/user-settings-page/notifications-settings.svelte';
-  import UserPurchaseSettings from '$lib/components/user-settings-page/user-purchase-settings.svelte';
-  import UserUsageStatistic from '$lib/components/user-settings-page/user-usage-statistic.svelte';
+  import ChangePinCodeSettings from './PinCodeSettings.svelte';
+  import DownloadSettings from './download-settings.svelte';
+  import FeatureSettings from './feature-settings.svelte';
+  import NotificationsSettings from './notifications-settings.svelte';
+  import UserPurchaseSettings from './user-purchase-settings.svelte';
+  import UserUsageStatistic from './user-usage-statistic.svelte';
   import { OpenQueryParam, QueryParameter } from '$lib/constants';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import { oauth } from '$lib/utils';
@@ -26,8 +26,8 @@
     mdiTwoFactorAuthentication,
   } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import SettingAccordionState from '../shared-components/settings/setting-accordion-state.svelte';
-  import SettingAccordion from '../shared-components/settings/setting-accordion.svelte';
+  import SettingAccordionState from '$lib/components/shared-components/settings/setting-accordion-state.svelte';
+  import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import AppSettings from './app-settings.svelte';
   import ChangePasswordSettings from './change-password-settings.svelte';
   import DeviceList from './device-list.svelte';
diff --git a/web/src/lib/components/user-settings-page/user-usage-statistic.svelte b/web/src/routes/(user)/user-settings/user-usage-statistic.svelte
similarity index 100%
rename from web/src/lib/components/user-settings-page/user-usage-statistic.svelte
rename to web/src/routes/(user)/user-settings/user-usage-statistic.svelte
diff --git a/web/src/routes/(user)/utilities/+page.svelte b/web/src/routes/(user)/utilities/+page.svelte
index 6713fe4a4b..3eb6470c6c 100644
--- a/web/src/routes/(user)/utilities/+page.svelte
+++ b/web/src/routes/(user)/utilities/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
   import type { PageData } from './$types';
-  import UtilitiesMenu from '$lib/components/utilities-page/utilities-menu.svelte';
+  import UtilitiesMenu from './utilities-menu.svelte';
 
   interface Props {
     data: PageData;
diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 148ad08a02..4c348fefcc 100644
--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -3,8 +3,8 @@
   import { page } from '$app/state';
   import { shortcuts } from '$lib/actions/shortcut';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import LinkToDocs from '$lib/components/LinkToDocs.svelte';
-  import DuplicatesCompareControl from '$lib/components/utilities-page/duplicates/duplicates-compare-control.svelte';
+  import LinkToDocs from './LinkToDocs.svelte';
+  import DuplicatesCompareControl from './duplicates-compare-control.svelte';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
diff --git a/web/src/lib/components/LinkToDocs.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/LinkToDocs.svelte
similarity index 100%
rename from web/src/lib/components/LinkToDocs.svelte
rename to web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/LinkToDocs.svelte
diff --git a/web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/duplicate-asset.svelte
similarity index 100%
rename from web/src/lib/components/utilities-page/duplicates/duplicate-asset.svelte
rename to web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/duplicate-asset.svelte
diff --git a/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/duplicates-compare-control.svelte
similarity index 98%
rename from web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte
rename to web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/duplicates-compare-control.svelte
index 094b50813b..063992f609 100644
--- a/web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/duplicates-compare-control.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { shortcuts } from '$lib/actions/shortcut';
-  import DuplicateAsset from '$lib/components/utilities-page/duplicates/duplicate-asset.svelte';
+  import DuplicateAsset from './duplicate-asset.svelte';
   import Portal from '$lib/elements/Portal.svelte';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
diff --git a/web/src/lib/components/utilities-page/duplicates/info-row.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/info-row.svelte
similarity index 100%
rename from web/src/lib/components/utilities-page/duplicates/info-row.svelte
rename to web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/info-row.svelte
diff --git a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 9d87eee922..c64f93202d 100644
--- a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Action } from '$lib/components/asset-viewer/actions/action';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import LargeAssetData from '$lib/components/utilities-page/large-assets/large-asset-data.svelte';
+  import LargeAssetData from './large-asset-data.svelte';
   import Portal from '$lib/elements/Portal.svelte';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import { handlePromiseError } from '$lib/utils';
diff --git a/web/src/lib/components/utilities-page/large-assets/large-asset-data.svelte b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/large-asset-data.svelte
similarity index 100%
rename from web/src/lib/components/utilities-page/large-assets/large-asset-data.svelte
rename to web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/large-asset-data.svelte
diff --git a/web/src/lib/components/utilities-page/utilities-menu.svelte b/web/src/routes/(user)/utilities/utilities-menu.svelte
similarity index 100%
rename from web/src/lib/components/utilities-page/utilities-menu.svelte
rename to web/src/routes/(user)/utilities/utilities-menu.svelte
diff --git a/web/src/routes/(user)/utilities/workflows/[workflowId]/+page.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/+page.svelte
index 2f1104b2fc..204a046593 100644
--- a/web/src/routes/(user)/utilities/workflows/[workflowId]/+page.svelte
+++ b/web/src/routes/(user)/utilities/workflows/[workflowId]/+page.svelte
@@ -2,11 +2,11 @@
   import { beforeNavigate, goto } from '$app/navigation';
   import { dragAndDrop } from '$lib/attachments/drag-and-drop.svelte';
   import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
-  import SchemaFormFields from '$lib/components/workflows/SchemaFormFields.svelte';
-  import WorkflowCardConnector from '$lib/components/workflows/WorkflowCardConnector.svelte';
-  import WorkflowJsonEditor from '$lib/components/workflows/WorkflowJsonEditor.svelte';
-  import WorkflowSummarySidebar from '$lib/components/workflows/WorkflowSummary.svelte';
-  import WorkflowTriggerCard from '$lib/components/workflows/WorkflowTriggerCard.svelte';
+  import SchemaFormFields from './SchemaFormFields.svelte';
+  import WorkflowCardConnector from './WorkflowCardConnector.svelte';
+  import WorkflowJsonEditor from './WorkflowJsonEditor.svelte';
+  import WorkflowSummarySidebar from './WorkflowSummary.svelte';
+  import WorkflowTriggerCard from './WorkflowTriggerCard.svelte';
   import AddWorkflowStepModal from '$lib/modals/AddWorkflowStepModal.svelte';
   import { Route } from '$lib/route';
   import {
diff --git a/web/src/lib/components/workflows/SchemaFormFields.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/SchemaFormFields.svelte
similarity index 100%
rename from web/src/lib/components/workflows/SchemaFormFields.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/SchemaFormFields.svelte
diff --git a/web/src/lib/components/workflows/WorkflowCardConnector.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowCardConnector.svelte
similarity index 100%
rename from web/src/lib/components/workflows/WorkflowCardConnector.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowCardConnector.svelte
diff --git a/web/src/lib/components/workflows/WorkflowJsonEditor.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowJsonEditor.svelte
similarity index 100%
rename from web/src/lib/components/workflows/WorkflowJsonEditor.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowJsonEditor.svelte
diff --git a/web/src/lib/components/workflows/WorkflowPickerField.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowPickerField.svelte
similarity index 97%
rename from web/src/lib/components/workflows/WorkflowPickerField.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowPickerField.svelte
index 0ba85904a2..4513580f9d 100644
--- a/web/src/lib/components/workflows/WorkflowPickerField.svelte
+++ b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowPickerField.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import WorkflowPickerItemCard from '$lib/components/workflows/WorkflowPickerItemCard.svelte';
+  import WorkflowPickerItemCard from './WorkflowPickerItemCard.svelte';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
   import PeoplePickerModal from '$lib/modals/PeoplePickerModal.svelte';
   import { fetchPickerMetadata, type PickerMetadata } from '$lib/services/workflow.service';
diff --git a/web/src/lib/components/workflows/WorkflowPickerItemCard.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowPickerItemCard.svelte
similarity index 100%
rename from web/src/lib/components/workflows/WorkflowPickerItemCard.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowPickerItemCard.svelte
diff --git a/web/src/lib/components/workflows/WorkflowSummary.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowSummary.svelte
similarity index 100%
rename from web/src/lib/components/workflows/WorkflowSummary.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowSummary.svelte
diff --git a/web/src/lib/components/workflows/WorkflowTriggerCard.svelte b/web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowTriggerCard.svelte
similarity index 100%
rename from web/src/lib/components/workflows/WorkflowTriggerCard.svelte
rename to web/src/routes/(user)/utilities/workflows/[workflowId]/WorkflowTriggerCard.svelte
diff --git a/web/src/routes/+error.svelte b/web/src/routes/+error.svelte
index 9da0d52ff0..72ec0b9cf8 100644
--- a/web/src/routes/+error.svelte
+++ b/web/src/routes/+error.svelte
@@ -1,6 +1,6 @@
 <script>
   import { page } from '$app/state';
-  import ErrorLayout from '$lib/components/layouts/ErrorLayout.svelte';
+  import ErrorLayout from './ErrorLayout.svelte';
 </script>
 
 <ErrorLayout error={page.error}></ErrorLayout>
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index a4aca07604..31726238f8 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -2,12 +2,12 @@
   import { afterNavigate, beforeNavigate } from '$app/navigation';
   import { page } from '$app/state';
   import { getPagesProvider, getSettingsProvider } from '$lib/commands';
-  import DownloadPanel from '$lib/components/asset-viewer/download-panel.svelte';
-  import ErrorLayout from '$lib/components/layouts/ErrorLayout.svelte';
+  import DownloadPanel from './download-panel.svelte';
+  import ErrorLayout from './ErrorLayout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import NavigationLoadingBar from '$lib/components/shared-components/navigation-loading-bar.svelte';
-  import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';
-  import VersionAnnouncement from '$lib/components/VersionAnnouncement.svelte';
+  import NavigationLoadingBar from './navigation-loading-bar.svelte';
+  import UploadPanel from './upload-panel.svelte';
+  import VersionAnnouncement from './VersionAnnouncement.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { eventManager } from '$lib/managers/event-manager.svelte';
   import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
diff --git a/web/src/lib/components/layouts/ErrorLayout.svelte b/web/src/routes/ErrorLayout.svelte
similarity index 100%
rename from web/src/lib/components/layouts/ErrorLayout.svelte
rename to web/src/routes/ErrorLayout.svelte
diff --git a/web/src/lib/components/VersionAnnouncement.svelte b/web/src/routes/VersionAnnouncement.svelte
similarity index 100%
rename from web/src/lib/components/VersionAnnouncement.svelte
rename to web/src/routes/VersionAnnouncement.svelte
diff --git a/web/src/routes/admin/queues/+page.svelte b/web/src/routes/admin/queues/+page.svelte
index 07f754670a..4546019036 100644
--- a/web/src/routes/admin/queues/+page.svelte
+++ b/web/src/routes/admin/queues/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import OnEvents from '$lib/components/OnEvents.svelte';
-  import JobsPanel from '$lib/components/QueuePanel.svelte';
+  import JobsPanel from './QueuePanel.svelte';
   import { queueManager } from '$lib/managers/queue-manager.svelte';
   import { getQueuesActions } from '$lib/services/queue.service';
   import { type QueueResponseDto } from '@immich/sdk';
diff --git a/web/src/lib/components/QueueCard.svelte b/web/src/routes/admin/queues/QueueCard.svelte
similarity index 98%
rename from web/src/lib/components/QueueCard.svelte
rename to web/src/routes/admin/queues/QueueCard.svelte
index 448558ed9f..356aafa118 100644
--- a/web/src/lib/components/QueueCard.svelte
+++ b/web/src/routes/admin/queues/QueueCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { cleanClass } from '$lib';
-  import QueueCardBadge from '$lib/components/QueueCardBadge.svelte';
-  import QueueCardButton from '$lib/components/QueueCardButton.svelte';
+  import QueueCardBadge from './QueueCardBadge.svelte';
+  import QueueCardButton from './QueueCardButton.svelte';
   import Badge from '$lib/elements/Badge.svelte';
   import { Route } from '$lib/route';
   import { asQueueItem } from '$lib/services/queue.service';
diff --git a/web/src/lib/components/QueueCardBadge.svelte b/web/src/routes/admin/queues/QueueCardBadge.svelte
similarity index 100%
rename from web/src/lib/components/QueueCardBadge.svelte
rename to web/src/routes/admin/queues/QueueCardBadge.svelte
diff --git a/web/src/lib/components/QueueCardButton.svelte b/web/src/routes/admin/queues/QueueCardButton.svelte
similarity index 100%
rename from web/src/lib/components/QueueCardButton.svelte
rename to web/src/routes/admin/queues/QueueCardButton.svelte
diff --git a/web/src/lib/components/QueuePanel.svelte b/web/src/routes/admin/queues/QueuePanel.svelte
similarity index 95%
rename from web/src/lib/components/QueuePanel.svelte
rename to web/src/routes/admin/queues/QueuePanel.svelte
index 2b091c6750..a22aac7d45 100644
--- a/web/src/lib/components/QueuePanel.svelte
+++ b/web/src/routes/admin/queues/QueuePanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import QueueCard from '$lib/components/QueueCard.svelte';
-  import QueueStorageMigrationDescription from '$lib/components/QueueStorageMigrationDescription.svelte';
+  import QueueCard from './QueueCard.svelte';
+  import QueueStorageMigrationDescription from './QueueStorageMigrationDescription.svelte';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import { queueManager } from '$lib/managers/queue-manager.svelte';
   import { asQueueItem } from '$lib/services/queue.service';
diff --git a/web/src/lib/components/QueueStorageMigrationDescription.svelte b/web/src/routes/admin/queues/QueueStorageMigrationDescription.svelte
similarity index 100%
rename from web/src/lib/components/QueueStorageMigrationDescription.svelte
rename to web/src/routes/admin/queues/QueueStorageMigrationDescription.svelte
diff --git a/web/src/routes/admin/queues/[name]/+page.svelte b/web/src/routes/admin/queues/[name]/+page.svelte
index 0b0e741f97..26b7f3fc70 100644
--- a/web/src/routes/admin/queues/[name]/+page.svelte
+++ b/web/src/routes/admin/queues/[name]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
-  import QueueGraph from '$lib/components/QueueGraph.svelte';
+  import QueueGraph from './QueueGraph.svelte';
   import { queueManager } from '$lib/managers/queue-manager.svelte';
   import { Route } from '$lib/route';
   import { asQueueItem, getQueueActions } from '$lib/services/queue.service';
diff --git a/web/src/lib/components/QueueGraph.svelte b/web/src/routes/admin/queues/[name]/QueueGraph.svelte
similarity index 100%
rename from web/src/lib/components/QueueGraph.svelte
rename to web/src/routes/admin/queues/[name]/QueueGraph.svelte
diff --git a/web/src/routes/admin/server-status/+page.svelte b/web/src/routes/admin/server-status/+page.svelte
index 01f5009daa..d8eb636cf5 100644
--- a/web/src/routes/admin/server-status/+page.svelte
+++ b/web/src/routes/admin/server-status/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
-  import ServerStatisticsPanel from '$lib/components/server-statistics/ServerStatisticsPanel.svelte';
+  import ServerStatisticsPanel from './ServerStatisticsPanel.svelte';
   import { getServerStatistics, type ServerStatsResponseDto } from '@immich/sdk';
   import { Container } from '@immich/ui';
   import { onMount } from 'svelte';
diff --git a/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte b/web/src/routes/admin/server-status/ServerStatisticsPanel.svelte
similarity index 100%
rename from web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
rename to web/src/routes/admin/server-status/ServerStatisticsPanel.svelte
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index 13fa9d482b..6dbc73185d 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
-  import AuthSettings from '$lib/components/admin-settings/AuthSettings.svelte';
-  import BackupSettings from '$lib/components/admin-settings/BackupSettings.svelte';
-  import FFmpegSettings from '$lib/components/admin-settings/FFmpegSettings.svelte';
-  import ImageSettings from '$lib/components/admin-settings/ImageSettings.svelte';
-  import JobSettings from '$lib/components/admin-settings/JobSettings.svelte';
-  import LibrarySettings from '$lib/components/admin-settings/LibrarySettings.svelte';
-  import LoggingSettings from '$lib/components/admin-settings/LoggingSettings.svelte';
-  import MachineLearningSettings from '$lib/components/admin-settings/MachineLearningSettings.svelte';
-  import MapSettings from '$lib/components/admin-settings/MapSettings.svelte';
-  import MetadataSettings from '$lib/components/admin-settings/MetadataSettings.svelte';
-  import NewVersionCheckSettings from '$lib/components/admin-settings/NewVersionCheckSettings.svelte';
-  import NightlyTasksSettings from '$lib/components/admin-settings/NightlyTasksSettings.svelte';
-  import NotificationSettings from '$lib/components/admin-settings/NotificationSettings.svelte';
-  import ServerSettings from '$lib/components/admin-settings/ServerSettings.svelte';
+  import AuthSettings from './AuthSettings.svelte';
+  import BackupSettings from './BackupSettings.svelte';
+  import FFmpegSettings from './FFmpegSettings.svelte';
+  import ImageSettings from './ImageSettings.svelte';
+  import JobSettings from './JobSettings.svelte';
+  import LibrarySettings from './LibrarySettings.svelte';
+  import LoggingSettings from './LoggingSettings.svelte';
+  import MachineLearningSettings from './MachineLearningSettings.svelte';
+  import MapSettings from './MapSettings.svelte';
+  import MetadataSettings from './MetadataSettings.svelte';
+  import NewVersionCheckSettings from './NewVersionCheckSettings.svelte';
+  import NightlyTasksSettings from './NightlyTasksSettings.svelte';
+  import NotificationSettings from './NotificationSettings.svelte';
+  import ServerSettings from './ServerSettings.svelte';
   import StorageTemplateSettings from '$lib/components/admin-settings/StorageTemplateSettings.svelte';
-  import ThemeSettings from '$lib/components/admin-settings/ThemeSettings.svelte';
-  import TrashSettings from '$lib/components/admin-settings/TrashSettings.svelte';
-  import UserSettings from '$lib/components/admin-settings/UserSettings.svelte';
+  import ThemeSettings from './ThemeSettings.svelte';
+  import TrashSettings from './TrashSettings.svelte';
+  import UserSettings from './UserSettings.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import SettingAccordionState from '$lib/components/shared-components/settings/setting-accordion-state.svelte';
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
diff --git a/web/src/lib/components/admin-settings/AuthSettings.svelte b/web/src/routes/admin/system-settings/AuthSettings.svelte
similarity index 99%
rename from web/src/lib/components/admin-settings/AuthSettings.svelte
rename to web/src/routes/admin/system-settings/AuthSettings.svelte
index e6fd72724c..50280f58c8 100644
--- a/web/src/lib/components/admin-settings/AuthSettings.svelte
+++ b/web/src/routes/admin/system-settings/AuthSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
   import { SettingInputFieldType } from '$lib/constants';
diff --git a/web/src/lib/components/admin-settings/BackupSettings.svelte b/web/src/routes/admin/system-settings/BackupSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-settings/BackupSettings.svelte
rename to web/src/routes/admin/system-settings/BackupSettings.svelte
index 7fd22a2b6d..69f0f1b245 100644
--- a/web/src/lib/components/admin-settings/BackupSettings.svelte
+++ b/web/src/routes/admin/system-settings/BackupSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { SettingInputFieldType } from '$lib/constants';
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
diff --git a/web/src/lib/components/admin-settings/FFmpegSettings.svelte b/web/src/routes/admin/system-settings/FFmpegSettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-settings/FFmpegSettings.svelte
rename to web/src/routes/admin/system-settings/FFmpegSettings.svelte
index 95aa9d74f2..ac5c596b99 100644
--- a/web/src/lib/components/admin-settings/FFmpegSettings.svelte
+++ b/web/src/routes/admin/system-settings/FFmpegSettings.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
-  import SettingCheckboxes from '$lib/components/shared-components/settings/setting-checkboxes.svelte';
+  import SettingCheckboxes from './setting-checkboxes.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
   import { SettingInputFieldType } from '$lib/constants';
diff --git a/web/src/lib/components/admin-settings/ImageSettings.svelte b/web/src/routes/admin/system-settings/ImageSettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-settings/ImageSettings.svelte
rename to web/src/routes/admin/system-settings/ImageSettings.svelte
index e1f4ec5008..d22935082a 100644
--- a/web/src/lib/components/admin-settings/ImageSettings.svelte
+++ b/web/src/routes/admin/system-settings/ImageSettings.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import { Colorspace, ImageFormat } from '@immich/sdk';
   import { fade } from 'svelte/transition';
 
diff --git a/web/src/lib/components/admin-settings/JobSettings.svelte b/web/src/routes/admin/system-settings/JobSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/JobSettings.svelte
rename to web/src/routes/admin/system-settings/JobSettings.svelte
diff --git a/web/src/lib/components/admin-settings/LibrarySettings.svelte b/web/src/routes/admin/system-settings/LibrarySettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-settings/LibrarySettings.svelte
rename to web/src/routes/admin/system-settings/LibrarySettings.svelte
index 52c2eb8d4f..1bf59c29a6 100644
--- a/web/src/lib/components/admin-settings/LibrarySettings.svelte
+++ b/web/src/routes/admin/system-settings/LibrarySettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
   import { SettingInputFieldType } from '$lib/constants';
diff --git a/web/src/lib/components/admin-settings/LoggingSettings.svelte b/web/src/routes/admin/system-settings/LoggingSettings.svelte
similarity index 95%
rename from web/src/lib/components/admin-settings/LoggingSettings.svelte
rename to web/src/routes/admin/system-settings/LoggingSettings.svelte
index 6052b8ea9f..0d5f0c4e22 100644
--- a/web/src/lib/components/admin-settings/LoggingSettings.svelte
+++ b/web/src/routes/admin/system-settings/LoggingSettings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
diff --git a/web/src/lib/components/admin-settings/MachineLearningSettings.svelte b/web/src/routes/admin/system-settings/MachineLearningSettings.svelte
similarity index 99%
rename from web/src/lib/components/admin-settings/MachineLearningSettings.svelte
rename to web/src/routes/admin/system-settings/MachineLearningSettings.svelte
index 579efef916..3544ddeb14 100644
--- a/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
+++ b/web/src/routes/admin/system-settings/MachineLearningSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSelect from './setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
   import { SettingInputFieldType } from '$lib/constants';
diff --git a/web/src/lib/components/admin-settings/MapSettings.svelte b/web/src/routes/admin/system-settings/MapSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/MapSettings.svelte
rename to web/src/routes/admin/system-settings/MapSettings.svelte
diff --git a/web/src/lib/components/admin-settings/MetadataSettings.svelte b/web/src/routes/admin/system-settings/MetadataSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/MetadataSettings.svelte
rename to web/src/routes/admin/system-settings/MetadataSettings.svelte
diff --git a/web/src/lib/components/admin-settings/NewVersionCheckSettings.svelte b/web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/NewVersionCheckSettings.svelte
rename to web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte
diff --git a/web/src/lib/components/admin-settings/NightlyTasksSettings.svelte b/web/src/routes/admin/system-settings/NightlyTasksSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/NightlyTasksSettings.svelte
rename to web/src/routes/admin/system-settings/NightlyTasksSettings.svelte
diff --git a/web/src/lib/components/admin-settings/NotificationSettings.svelte b/web/src/routes/admin/system-settings/NotificationSettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-settings/NotificationSettings.svelte
rename to web/src/routes/admin/system-settings/NotificationSettings.svelte
index a71d71a6b6..2b5f1da9fb 100644
--- a/web/src/lib/components/admin-settings/NotificationSettings.svelte
+++ b/web/src/routes/admin/system-settings/NotificationSettings.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import TemplateSettings from '$lib/components/admin-settings/TemplateSettings.svelte';
+  import TemplateSettings from './TemplateSettings.svelte';
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
diff --git a/web/src/lib/components/admin-settings/ServerSettings.svelte b/web/src/routes/admin/system-settings/ServerSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/ServerSettings.svelte
rename to web/src/routes/admin/system-settings/ServerSettings.svelte
diff --git a/web/src/lib/components/admin-settings/TemplateSettings.svelte b/web/src/routes/admin/system-settings/TemplateSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-settings/TemplateSettings.svelte
rename to web/src/routes/admin/system-settings/TemplateSettings.svelte
index 7ef1bcde0d..b6420a4c47 100644
--- a/web/src/lib/components/admin-settings/TemplateSettings.svelte
+++ b/web/src/routes/admin/system-settings/TemplateSettings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
-  import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
+  import SettingTextarea from './setting-textarea.svelte';
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
   import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
   import EmailTemplatePreviewModal from '$lib/modals/EmailTemplatePreviewModal.svelte';
diff --git a/web/src/lib/components/admin-settings/ThemeSettings.svelte b/web/src/routes/admin/system-settings/ThemeSettings.svelte
similarity index 92%
rename from web/src/lib/components/admin-settings/ThemeSettings.svelte
rename to web/src/routes/admin/system-settings/ThemeSettings.svelte
index f2e9b51f11..a44d180615 100644
--- a/web/src/lib/components/admin-settings/ThemeSettings.svelte
+++ b/web/src/routes/admin/system-settings/ThemeSettings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import SettingButtonsRow from '$lib/components/shared-components/settings/SystemConfigButtonRow.svelte';
-  import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
+  import SettingTextarea from './setting-textarea.svelte';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
   import { t } from 'svelte-i18n';
diff --git a/web/src/lib/components/admin-settings/TrashSettings.svelte b/web/src/routes/admin/system-settings/TrashSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/TrashSettings.svelte
rename to web/src/routes/admin/system-settings/TrashSettings.svelte
diff --git a/web/src/lib/components/admin-settings/UserSettings.svelte b/web/src/routes/admin/system-settings/UserSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-settings/UserSettings.svelte
rename to web/src/routes/admin/system-settings/UserSettings.svelte
diff --git a/web/src/lib/components/shared-components/settings/setting-checkboxes.svelte b/web/src/routes/admin/system-settings/setting-checkboxes.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/settings/setting-checkboxes.svelte
rename to web/src/routes/admin/system-settings/setting-checkboxes.svelte
diff --git a/web/src/lib/components/shared-components/settings/setting-select.svelte b/web/src/routes/admin/system-settings/setting-select.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/settings/setting-select.svelte
rename to web/src/routes/admin/system-settings/setting-select.svelte
diff --git a/web/src/lib/components/shared-components/settings/setting-textarea.svelte b/web/src/routes/admin/system-settings/setting-textarea.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/settings/setting-textarea.svelte
rename to web/src/routes/admin/system-settings/setting-textarea.svelte
diff --git a/web/src/routes/admin/users/[id]/+layout.svelte b/web/src/routes/admin/users/[id]/+layout.svelte
index 8e14626f8f..f9f1fbe2ee 100644
--- a/web/src/routes/admin/users/[id]/+layout.svelte
+++ b/web/src/routes/admin/users/[id]/+layout.svelte
@@ -6,7 +6,7 @@
   import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
-  import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
+  import FeatureSetting from './FeatureSetting.svelte';
   import { Route } from '$lib/route';
   import { getUserAdminActions } from '$lib/services/user-admin.service';
   import { locale } from '$lib/stores/preferences.store';
diff --git a/web/src/lib/components/users/FeatureSetting.svelte b/web/src/routes/admin/users/[id]/FeatureSetting.svelte
similarity index 100%
rename from web/src/lib/components/users/FeatureSetting.svelte
rename to web/src/routes/admin/users/[id]/FeatureSetting.svelte
diff --git a/web/src/routes/auth/onboarding/+page.svelte b/web/src/routes/auth/onboarding/+page.svelte
index db9e8eb27f..657f55e8f2 100644
--- a/web/src/routes/auth/onboarding/+page.svelte
+++ b/web/src/routes/auth/onboarding/+page.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import { page } from '$app/state';
-  import OnboardingBackup from '$lib/components/onboarding-page/onboarding-backup.svelte';
-  import OnboardingCard from '$lib/components/onboarding-page/onboarding-card.svelte';
-  import OnboardingHello from '$lib/components/onboarding-page/onboarding-hello.svelte';
-  import OnboardingLocale from '$lib/components/onboarding-page/onboarding-language.svelte';
-  import OnboardingMobileApp from '$lib/components/onboarding-page/onboarding-mobile-app.svelte';
-  import OnboardingServerPrivacy from '$lib/components/onboarding-page/onboarding-server-privacy.svelte';
-  import OnboardingStorageTemplate from '$lib/components/onboarding-page/onboarding-storage-template.svelte';
-  import OnboardingTheme from '$lib/components/onboarding-page/onboarding-theme.svelte';
-  import OnboardingUserPrivacy from '$lib/components/onboarding-page/onboarding-user-privacy.svelte';
+  import OnboardingBackup from './onboarding-backup.svelte';
+  import OnboardingCard from './onboarding-card.svelte';
+  import OnboardingHello from './onboarding-hello.svelte';
+  import OnboardingLocale from './onboarding-language.svelte';
+  import OnboardingMobileApp from './onboarding-mobile-app.svelte';
+  import OnboardingServerPrivacy from './onboarding-server-privacy.svelte';
+  import OnboardingStorageTemplate from './onboarding-storage-template.svelte';
+  import OnboardingTheme from './onboarding-theme.svelte';
+  import OnboardingUserPrivacy from './onboarding-user-privacy.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
   import { systemConfigManager } from '$lib/managers/system-config-manager.svelte';
diff --git a/web/src/lib/components/onboarding-page/onboarding-backup.svelte b/web/src/routes/auth/onboarding/onboarding-backup.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-backup.svelte
rename to web/src/routes/auth/onboarding/onboarding-backup.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-card.svelte b/web/src/routes/auth/onboarding/onboarding-card.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-card.svelte
rename to web/src/routes/auth/onboarding/onboarding-card.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-hello.svelte b/web/src/routes/auth/onboarding/onboarding-hello.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-hello.svelte
rename to web/src/routes/auth/onboarding/onboarding-hello.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-language.svelte b/web/src/routes/auth/onboarding/onboarding-language.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-language.svelte
rename to web/src/routes/auth/onboarding/onboarding-language.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte b/web/src/routes/auth/onboarding/onboarding-mobile-app.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-mobile-app.svelte
rename to web/src/routes/auth/onboarding/onboarding-mobile-app.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-server-privacy.svelte b/web/src/routes/auth/onboarding/onboarding-server-privacy.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-server-privacy.svelte
rename to web/src/routes/auth/onboarding/onboarding-server-privacy.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte b/web/src/routes/auth/onboarding/onboarding-storage-template.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
rename to web/src/routes/auth/onboarding/onboarding-storage-template.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-theme.svelte b/web/src/routes/auth/onboarding/onboarding-theme.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-theme.svelte
rename to web/src/routes/auth/onboarding/onboarding-theme.svelte
diff --git a/web/src/lib/components/onboarding-page/onboarding-user-privacy.svelte b/web/src/routes/auth/onboarding/onboarding-user-privacy.svelte
similarity index 100%
rename from web/src/lib/components/onboarding-page/onboarding-user-privacy.svelte
rename to web/src/routes/auth/onboarding/onboarding-user-privacy.svelte
diff --git a/web/src/lib/components/asset-viewer/download-panel.svelte b/web/src/routes/download-panel.svelte
similarity index 97%
rename from web/src/lib/components/asset-viewer/download-panel.svelte
rename to web/src/routes/download-panel.svelte
index 679cd2f9f1..ddebd136ff 100644
--- a/web/src/lib/components/asset-viewer/download-panel.svelte
+++ b/web/src/routes/download-panel.svelte
@@ -5,7 +5,7 @@
   import { mdiClose } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { fly, slide } from 'svelte/transition';
-  import { getByteUnitString } from '../../utils/byte-units';
+  import { getByteUnitString } from '$lib/utils/byte-units';
 
   const abort = (downloadKey: string, download: DownloadProgress) => {
     download.abort?.abort();
diff --git a/web/src/routes/maintenance/+page.svelte b/web/src/routes/maintenance/+page.svelte
index b58c1960ad..6ff0044588 100644
--- a/web/src/routes/maintenance/+page.svelte
+++ b/web/src/routes/maintenance/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AuthPageLayout from '$lib/components/layouts/AuthPageLayout.svelte';
-  import MaintenanceRestoreFlow from '$lib/components/maintenance/MaintenanceRestoreFlow.svelte';
+  import MaintenanceRestoreFlow from './MaintenanceRestoreFlow.svelte';
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
   import { handleSetMaintenanceMode } from '$lib/services/maintenance.service';
   import { maintenanceStore } from '$lib/stores/maintenance.store';
diff --git a/web/src/lib/components/maintenance/MaintenanceRestoreFlow.svelte b/web/src/routes/maintenance/MaintenanceRestoreFlow.svelte
similarity index 60%
rename from web/src/lib/components/maintenance/MaintenanceRestoreFlow.svelte
rename to web/src/routes/maintenance/MaintenanceRestoreFlow.svelte
index 79a861a59e..97119ea2f9 100644
--- a/web/src/lib/components/maintenance/MaintenanceRestoreFlow.svelte
+++ b/web/src/routes/maintenance/MaintenanceRestoreFlow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import RestoreFlowDetectInstall from '$lib/components/maintenance/restore-flow/RestoreFlowDetectInstall.svelte';
-  import RestoreFlowSelectBackup from '$lib/components/maintenance/restore-flow/RestoreFlowSelectBackup.svelte';
+  import RestoreFlowDetectInstall from './RestoreFlowDetectInstall.svelte';
+  import RestoreFlowSelectBackup from './RestoreFlowSelectBackup.svelte';
 
   type Props = {
     end: () => void;
diff --git a/web/src/lib/components/maintenance/restore-flow/RestoreFlowDetectInstall.svelte b/web/src/routes/maintenance/RestoreFlowDetectInstall.svelte
similarity index 100%
rename from web/src/lib/components/maintenance/restore-flow/RestoreFlowDetectInstall.svelte
rename to web/src/routes/maintenance/RestoreFlowDetectInstall.svelte
diff --git a/web/src/lib/components/maintenance/restore-flow/RestoreFlowSelectBackup.svelte b/web/src/routes/maintenance/RestoreFlowSelectBackup.svelte
similarity index 88%
rename from web/src/lib/components/maintenance/restore-flow/RestoreFlowSelectBackup.svelte
rename to web/src/routes/maintenance/RestoreFlowSelectBackup.svelte
index 907d017c8c..d8a3173275 100644
--- a/web/src/lib/components/maintenance/restore-flow/RestoreFlowSelectBackup.svelte
+++ b/web/src/routes/maintenance/RestoreFlowSelectBackup.svelte
@@ -2,7 +2,7 @@
   import { Button, Heading, HStack, Scrollable } from '@immich/ui';
   import { mdiArrowLeft } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import MaintenanceBackupsList from '../MaintenanceBackupsList.svelte';
+  import MaintenanceBackupsList from '$lib/components/maintenance/MaintenanceBackupsList.svelte';
 
   type Props = {
     previous: () => void;
diff --git a/web/src/lib/components/shared-components/navigation-loading-bar.svelte b/web/src/routes/navigation-loading-bar.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/navigation-loading-bar.svelte
rename to web/src/routes/navigation-loading-bar.svelte
diff --git a/web/src/lib/components/shared-components/upload-asset-preview.svelte b/web/src/routes/upload-asset-preview.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/upload-asset-preview.svelte
rename to web/src/routes/upload-asset-preview.svelte
diff --git a/web/src/lib/components/shared-components/upload-panel.svelte b/web/src/routes/upload-panel.svelte
similarity index 100%
rename from web/src/lib/components/shared-components/upload-panel.svelte
rename to web/src/routes/upload-panel.svelte