diff --git a/web/src/lib/components/admin-page/jobs/job-tile.svelte b/web/src/lib/components/jobs/JobTile.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/jobs/job-tile.svelte
rename to web/src/lib/components/jobs/JobTile.svelte
index 4ccbef7781..7823e3ee9b 100644
--- a/web/src/lib/components/admin-page/jobs/job-tile.svelte
+++ b/web/src/lib/components/jobs/JobTile.svelte
@@ -15,8 +15,8 @@
   } from '@mdi/js';
   import { type Component } from 'svelte';
   import { t } from 'svelte-i18n';
-  import JobTileButton from './job-tile-button.svelte';
-  import JobTileStatus from './job-tile-status.svelte';
+  import JobTileButton from './JobTileButton.svelte';
+  import JobTileStatus from './JobTileStatus.svelte';
 
   interface Props {
     title: string;
diff --git a/web/src/lib/components/admin-page/jobs/job-tile-button.svelte b/web/src/lib/components/jobs/JobTileButton.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/jobs/job-tile-button.svelte
rename to web/src/lib/components/jobs/JobTileButton.svelte
diff --git a/web/src/lib/components/admin-page/jobs/job-tile-status.svelte b/web/src/lib/components/jobs/JobTileStatus.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/jobs/job-tile-status.svelte
rename to web/src/lib/components/jobs/JobTileStatus.svelte
diff --git a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte b/web/src/lib/components/jobs/JobsPanel.svelte
similarity index 97%
rename from web/src/lib/components/admin-page/jobs/jobs-panel.svelte
rename to web/src/lib/components/jobs/JobsPanel.svelte
index 93e015e251..5aa3b4b92f 100644
--- a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte
+++ b/web/src/lib/components/jobs/JobsPanel.svelte
@@ -22,8 +22,8 @@
   } from '@mdi/js';
   import type { Component } from 'svelte';
   import { t } from 'svelte-i18n';
-  import JobTile from './job-tile.svelte';
-  import StorageMigrationDescription from './storage-migration-description.svelte';
+  import JobTile from './JobTile.svelte';
+  import StorageMigrationDescription from './StorageMigrationDescription.svelte';
 
   interface Props {
     jobs: AllJobStatusResponseDto;
diff --git a/web/src/lib/components/admin-page/jobs/storage-migration-description.svelte b/web/src/lib/components/jobs/StorageMigrationDescription.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/jobs/storage-migration-description.svelte
rename to web/src/lib/components/jobs/StorageMigrationDescription.svelte
diff --git a/web/src/lib/components/admin-page/server-stats/stats-card.svelte b/web/src/lib/components/server-statistics/ServerStatisticsCard.svelte
similarity index 100%
rename from web/src/lib/components/admin-page/server-stats/stats-card.svelte
rename to web/src/lib/components/server-statistics/ServerStatisticsCard.svelte
diff --git a/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte b/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
similarity index 98%
rename from web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
rename to web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
index 7a065b7da8..c8e46db576 100644
--- a/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
+++ b/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
+  import StatsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { getByteUnitString, getBytesWithUnit } from '$lib/utils/byte-units';
   import type { ServerStatsResponseDto } from '@immich/sdk';
   import { Icon } from '@immich/ui';
   import { mdiCameraIris, mdiChartPie, mdiPlayCircle } from '@mdi/js';
   import { t } from 'svelte-i18n';
-  import StatsCard from './stats-card.svelte';
 
   interface Props {
     stats?: ServerStatsResponseDto;
diff --git a/web/src/routes/admin/jobs-status/+page.svelte b/web/src/routes/admin/jobs-status/+page.svelte
index db846557e9..e5ecf9a15d 100644
--- a/web/src/routes/admin/jobs-status/+page.svelte
+++ b/web/src/routes/admin/jobs-status/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import JobsPanel from '$lib/components/admin-page/jobs/jobs-panel.svelte';
+  import JobsPanel from '$lib/components/jobs/JobsPanel.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
   import { AppRoute } from '$lib/constants';
   import JobCreateModal from '$lib/modals/JobCreateModal.svelte';
diff --git a/web/src/routes/admin/server-status/+page.svelte b/web/src/routes/admin/server-status/+page.svelte
index 1a264e20e6..5aa7bfe57a 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 ServerStatsPanel from '$lib/components/admin-page/server-stats/server-stats-panel.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
+  import ServerStatisticsPanel from '$lib/components/server-statistics/ServerStatisticsPanel.svelte';
   import { asyncTimeout } from '$lib/utils';
   import { getServerStatistics } from '@immich/sdk';
   import { onDestroy, onMount } from 'svelte';
@@ -29,7 +29,7 @@
 <AdminPageLayout title={data.meta.title}>
   <section id="setting-content" class="flex place-content-center sm:mx-4">
     <section class="w-full pb-28 sm:w-5/6 md:w-[850px]">
-      <ServerStatsPanel stats={data.stats} />
+      <ServerStatisticsPanel stats={data.stats} />
     </section>
   </section>
 </AdminPageLayout>
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index 5849458409..8d5e3111b0 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import StatsCard from '$lib/components/admin-page/server-stats/stats-card.svelte';
   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 {
     notificationController,
     NotificationType,
@@ -242,9 +242,9 @@
         </div>
         <div class="col-span-full">
           <div class="flex flex-col lg:flex-row gap-4 w-full">
-            <StatsCard icon={mdiCameraIris} title={$t('photos')} value={userStatistics.images} />
-            <StatsCard icon={mdiPlayCircle} title={$t('videos')} value={userStatistics.videos} />
-            <StatsCard icon={mdiChartPie} title={$t('storage')} value={statsUsage} unit={statsUsageUnit} />
+            <ServerStatisticsCard icon={mdiCameraIris} title={$t('photos')} value={userStatistics.images} />
+            <ServerStatisticsCard icon={mdiPlayCircle} title={$t('videos')} value={userStatistics.videos} />
+            <ServerStatisticsCard icon={mdiChartPie} title={$t('storage')} value={statsUsage} unit={statsUsageUnit} />
           </div>
         </div>
         <div>