diff --git a/web/src/lib/components/admin-page/settings/admin-settings.svelte b/web/src/lib/components/admin-settings/AdminSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/admin-settings.svelte
rename to web/src/lib/components/admin-settings/AdminSettings.svelte
diff --git a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte b/web/src/lib/components/admin-settings/AuthSettings.svelte
similarity index 99%
rename from web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
rename to web/src/lib/components/admin-settings/AuthSettings.svelte
index 06deb05a44..d7b73430e3 100644
--- a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte
+++ b/web/src/lib/components/admin-settings/AuthSettings.svelte
@@ -18,7 +18,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte b/web/src/lib/components/admin-settings/BackupSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte
rename to web/src/lib/components/admin-settings/BackupSettings.svelte
index 469d0b648a..878d2cd33a 100644
--- a/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte
+++ b/web/src/lib/components/admin-settings/BackupSettings.svelte
@@ -9,7 +9,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte b/web/src/lib/components/admin-settings/FFmpegSettings.svelte
similarity index 99%
rename from web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte
rename to web/src/lib/components/admin-settings/FFmpegSettings.svelte
index ae316498d8..d176839543 100644
--- a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte
+++ b/web/src/lib/components/admin-settings/FFmpegSettings.svelte
@@ -22,7 +22,7 @@
   import { isEqual, sortBy } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/image/image-settings.svelte b/web/src/lib/components/admin-settings/ImageSettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/settings/image/image-settings.svelte
rename to web/src/lib/components/admin-settings/ImageSettings.svelte
index 9a32e8e4e0..fd2ac29c6b 100644
--- a/web/src/lib/components/admin-page/settings/image/image-settings.svelte
+++ b/web/src/lib/components/admin-settings/ImageSettings.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
+  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
   import { Colorspace, ImageFormat, type SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
-  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import { t } from 'svelte-i18n';
-  import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
+  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { SettingInputFieldType } from '$lib/constants';
+  import { t } from 'svelte-i18n';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte b/web/src/lib/components/admin-settings/JobSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte
rename to web/src/lib/components/admin-settings/JobSettings.svelte
index de57de5286..ce4afb382b 100644
--- a/web/src/lib/components/admin-page/settings/job-settings/job-settings.svelte
+++ b/web/src/lib/components/admin-settings/JobSettings.svelte
@@ -7,7 +7,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte b/web/src/lib/components/admin-settings/LibrarySettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte
rename to web/src/lib/components/admin-settings/LibrarySettings.svelte
index 687ad5fd88..82ce13ae2c 100644
--- a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte
+++ b/web/src/lib/components/admin-settings/LibrarySettings.svelte
@@ -10,7 +10,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/logging-settings/logging-settings.svelte b/web/src/lib/components/admin-settings/LoggingSettings.svelte
similarity index 96%
rename from web/src/lib/components/admin-page/settings/logging-settings/logging-settings.svelte
rename to web/src/lib/components/admin-settings/LoggingSettings.svelte
index 5538183442..90bd04d9a6 100644
--- a/web/src/lib/components/admin-page/settings/logging-settings/logging-settings.svelte
+++ b/web/src/lib/components/admin-settings/LoggingSettings.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
+  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
+  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { LogLevel, type SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
-  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
-  import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
   import { t } from 'svelte-i18n';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte b/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
similarity index 99%
rename from web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte
rename to web/src/lib/components/admin-settings/MachineLearningSettings.svelte
index 6d9c73ce50..59bd058606 100644
--- a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte
+++ b/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
@@ -13,7 +13,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte b/web/src/lib/components/admin-settings/MapSettings.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte
rename to web/src/lib/components/admin-settings/MapSettings.svelte
index 59675d3ad6..525a789de9 100644
--- a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte
+++ b/web/src/lib/components/admin-settings/MapSettings.svelte
@@ -9,7 +9,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/metadata-settings/metadata-settings.svelte b/web/src/lib/components/admin-settings/MetadataSettings.svelte
similarity index 94%
rename from web/src/lib/components/admin-page/settings/metadata-settings/metadata-settings.svelte
rename to web/src/lib/components/admin-settings/MetadataSettings.svelte
index c5d3860ecd..04e2d010e1 100644
--- a/web/src/lib/components/admin-page/settings/metadata-settings/metadata-settings.svelte
+++ b/web/src/lib/components/admin-settings/MetadataSettings.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { SystemConfigDto } from '@immich/sdk';
-  import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
   import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import type { SystemConfigDto } from '@immich/sdk';
+  import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte b/web/src/lib/components/admin-settings/NewVersionCheckSettings.svelte
similarity index 94%
rename from web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte
rename to web/src/lib/components/admin-settings/NewVersionCheckSettings.svelte
index eb032a6115..b713f906c0 100644
--- a/web/src/lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte
+++ b/web/src/lib/components/admin-settings/NewVersionCheckSettings.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { SystemConfigDto } from '@immich/sdk';
-  import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
   import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import type { SystemConfigDto } from '@immich/sdk';
+  import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte b/web/src/lib/components/admin-settings/NightlyTasksSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte
rename to web/src/lib/components/admin-settings/NightlyTasksSettings.svelte
index af653f2473..9ba4e4e3b8 100644
--- a/web/src/lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte
+++ b/web/src/lib/components/admin-settings/NightlyTasksSettings.svelte
@@ -7,7 +7,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/notification-settings/notification-settings.svelte b/web/src/lib/components/admin-settings/NotificationSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/settings/notification-settings/notification-settings.svelte
rename to web/src/lib/components/admin-settings/NotificationSettings.svelte
index 4e9cb3507c..d1d698d4fa 100644
--- a/web/src/lib/components/admin-page/settings/notification-settings/notification-settings.svelte
+++ b/web/src/lib/components/admin-settings/NotificationSettings.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import TemplateSettings from '$lib/components/admin-page/settings/template-settings/template-settings.svelte';
+  import TemplateSettings from '$lib/components/admin-settings/TemplateSettings.svelte';
   import {
     NotificationType,
     notificationController,
@@ -16,7 +16,7 @@
   import { isEqual } from 'lodash-es';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/server/server-settings.svelte b/web/src/lib/components/admin-settings/ServerSettings.svelte
similarity index 96%
rename from web/src/lib/components/admin-page/settings/server/server-settings.svelte
rename to web/src/lib/components/admin-settings/ServerSettings.svelte
index 8a1ff807f3..d04b351eff 100644
--- a/web/src/lib/components/admin-page/settings/server/server-settings.svelte
+++ b/web/src/lib/components/admin-settings/ServerSettings.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
+  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
+  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
   import type { SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
-  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
   import { t } from 'svelte-i18n';
-  import { SettingInputFieldType } from '$lib/constants';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte b/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte
rename to web/src/lib/components/admin-settings/StorageTemplateSettings.svelte
index 63d8cc1107..43cc6e016b 100644
--- a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte
+++ b/web/src/lib/components/admin-settings/StorageTemplateSettings.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import SupportedDatetimePanel from '$lib/components/admin-settings/SupportedDatetimePanel.svelte';
+  import SupportedVariablesPanel from '$lib/components/admin-settings/SupportedVariablesPanel.svelte';
   import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
@@ -18,9 +20,7 @@
   import { t } from 'svelte-i18n';
   import { createBubbler, preventDefault } from 'svelte/legacy';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SupportedDatetimePanel from './supported-datetime-panel.svelte';
-  import SupportedVariablesPanel from './supported-variables-panel.svelte';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/storage-template/supported-datetime-panel.svelte b/web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/storage-template/supported-datetime-panel.svelte
rename to web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte
diff --git a/web/src/lib/components/admin-page/settings/storage-template/supported-variables-panel.svelte b/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/storage-template/supported-variables-panel.svelte
rename to web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte
diff --git a/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte b/web/src/lib/components/admin-settings/TemplateSettings.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte
rename to web/src/lib/components/admin-settings/TemplateSettings.svelte
diff --git a/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte b/web/src/lib/components/admin-settings/ThemeSettings.svelte
similarity index 94%
rename from web/src/lib/components/admin-page/settings/theme/theme-settings.svelte
rename to web/src/lib/components/admin-settings/ThemeSettings.svelte
index 64b4b92b5e..8cfd0beb2f 100644
--- a/web/src/lib/components/admin-page/settings/theme/theme-settings.svelte
+++ b/web/src/lib/components/admin-settings/ThemeSettings.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
+  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
+  import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
   import type { SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';
-  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import { t } from 'svelte-i18n';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte b/web/src/lib/components/admin-settings/TrashSettings.svelte
similarity index 95%
rename from web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte
rename to web/src/lib/components/admin-settings/TrashSettings.svelte
index f0f18f5d95..e69ec9e1e9 100644
--- a/web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte
+++ b/web/src/lib/components/admin-settings/TrashSettings.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
+  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
+  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
   import type { SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
-  import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
-  import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
-  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import { t } from 'svelte-i18n';
-  import { SettingInputFieldType } from '$lib/constants';
+  import { fade } from 'svelte/transition';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/user-settings/user-settings.svelte b/web/src/lib/components/admin-settings/UserSettings.svelte
similarity index 95%
rename from web/src/lib/components/admin-page/settings/user-settings/user-settings.svelte
rename to web/src/lib/components/admin-settings/UserSettings.svelte
index 422e1ebe49..cf05e590e8 100644
--- a/web/src/lib/components/admin-page/settings/user-settings/user-settings.svelte
+++ b/web/src/lib/components/admin-settings/UserSettings.svelte
@@ -2,12 +2,12 @@
   import { type SystemConfigDto } from '@immich/sdk';
   import { isEqual } from 'lodash-es';
   import { fade } from 'svelte/transition';
-  import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';
+  import type { SettingsResetEvent, SettingsSaveEvent } from './admin-settings';
 
   import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';
   import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
-  import { t } from 'svelte-i18n';
   import { SettingInputFieldType } from '$lib/constants';
+  import { t } from 'svelte-i18n';
 
   interface Props {
     savedConfig: SystemConfigDto;
diff --git a/web/src/lib/components/admin-page/settings/admin-settings.ts b/web/src/lib/components/admin-settings/admin-settings.ts
similarity index 100%
rename from web/src/lib/components/admin-page/settings/admin-settings.ts
rename to web/src/lib/components/admin-settings/admin-settings.ts
diff --git a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
index da05f3d747..4e266e410c 100644
--- a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import AdminSettings from '$lib/components/admin-page/settings/admin-settings.svelte';
-  import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';
+  import AdminSettings from '$lib/components/admin-settings/AdminSettings.svelte';
+  import StorageTemplateSettings from '$lib/components/admin-settings/StorageTemplateSettings.svelte';
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { user } from '$lib/stores/user.store';
diff --git a/web/src/lib/components/admin-page/user/feature-setting.svelte b/web/src/lib/components/users/FeatureSetting.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/user/feature-setting.svelte
rename to web/src/lib/components/users/FeatureSetting.svelte
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index 20cbca30d9..e13cebac67 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -1,24 +1,24 @@
 <script lang="ts">
-  import type { SettingsComponentProps } from '$lib/components/admin-page/settings/admin-settings';
-  import AdminSettings from '$lib/components/admin-page/settings/admin-settings.svelte';
-  import AuthSettings from '$lib/components/admin-page/settings/auth/auth-settings.svelte';
-  import BackupSettings from '$lib/components/admin-page/settings/backup-settings/backup-settings.svelte';
-  import FFmpegSettings from '$lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte';
-  import ImageSettings from '$lib/components/admin-page/settings/image/image-settings.svelte';
-  import JobSettings from '$lib/components/admin-page/settings/job-settings/job-settings.svelte';
-  import LibrarySettings from '$lib/components/admin-page/settings/library-settings/library-settings.svelte';
-  import LoggingSettings from '$lib/components/admin-page/settings/logging-settings/logging-settings.svelte';
-  import MachineLearningSettings from '$lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte';
-  import MapSettings from '$lib/components/admin-page/settings/map-settings/map-settings.svelte';
-  import MetadataSettings from '$lib/components/admin-page/settings/metadata-settings/metadata-settings.svelte';
-  import NewVersionCheckSettings from '$lib/components/admin-page/settings/new-version-check-settings/new-version-check-settings.svelte';
-  import NightlyTasksSettings from '$lib/components/admin-page/settings/nightly-tasks-settings/nightly-tasks-settings.svelte';
-  import NotificationSettings from '$lib/components/admin-page/settings/notification-settings/notification-settings.svelte';
-  import ServerSettings from '$lib/components/admin-page/settings/server/server-settings.svelte';
-  import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';
-  import ThemeSettings from '$lib/components/admin-page/settings/theme/theme-settings.svelte';
-  import TrashSettings from '$lib/components/admin-page/settings/trash-settings/trash-settings.svelte';
-  import UserSettings from '$lib/components/admin-page/settings/user-settings/user-settings.svelte';
+  import type { SettingsComponentProps } from '$lib/components/admin-settings/admin-settings';
+  import AdminSettings from '$lib/components/admin-settings/AdminSettings.svelte';
+  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 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 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/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index 8d5e3111b0..c51c311196 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import FeatureSetting from '$lib/components/admin-page/user/feature-setting.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
   import {
@@ -7,6 +6,7 @@
     NotificationType,
   } from '$lib/components/shared-components/notification/notification';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
+  import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
   import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
   import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
   import UserEditModal from '$lib/modals/UserEditModal.svelte';