diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte
index ea9e7e3dd1..9c6da9fda9 100644
--- a/web/src/lib/components/album-page/album-viewer.svelte
+++ b/web/src/lib/components/album-page/album-viewer.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
-  import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
   import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk';
   import { AssetStore } from '$lib/stores/assets-store.svelte';
@@ -20,6 +19,7 @@
   import { t } from 'svelte-i18n';
   import { onDestroy } from 'svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
+  import { dragAndDropManager } from '$lib/managers/drag-and-drop.manager.svelte';
 
   interface Props {
     sharedLink: SharedLinkResponseDto;
@@ -38,10 +38,10 @@
 
   const assetInteraction = new AssetInteraction();
 
-  dragAndDropFilesStore.subscribe((value) => {
-    if (value.isDragging && value.files.length > 0) {
-      handlePromiseError(fileUploadHandler(value.files, album.id));
-      dragAndDropFilesStore.set({ isDragging: false, files: [] });
+  $effect(() => {
+    if (dragAndDropManager.isDragging && dragAndDropManager.files.length > 0) {
+      handlePromiseError(fileUploadHandler(dragAndDropManager.files, album.id));
+      dragAndDropManager.reset();
     }
   });
 </script>
diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index 91461d574d..067d405818 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -5,7 +5,6 @@
   import NextAssetAction from '$lib/components/asset-viewer/actions/next-asset-action.svelte';
   import PreviousAssetAction from '$lib/components/asset-viewer/actions/previous-asset-action.svelte';
   import { AssetAction, ProjectionType } from '$lib/constants';
-  import { updateNumberOfComments } from '$lib/stores/activity.store';
   import { closeEditorCofirm } from '$lib/stores/asset-editor.store';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { isShowDetail } from '$lib/stores/preferences.store';
@@ -47,6 +46,7 @@
   import PhotoViewer from './photo-viewer.svelte';
   import SlideshowBar from './slideshow-bar.svelte';
   import VideoViewer from './video-wrapper-viewer.svelte';
+  import { activityManager } from '$lib/managers/activity.manager.svelte';
 
   type HasAsset = boolean;
 
@@ -137,12 +137,12 @@
 
   const handleAddComment = () => {
     numberOfComments++;
-    updateNumberOfComments(1);
+    activityManager.updateNumberOfComments(1);
   };
 
   const handleRemoveComment = () => {
     numberOfComments--;
-    updateNumberOfComments(-1);
+    activityManager.updateNumberOfComments(-1);
   };
 
   const handleFavorite = async () => {
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index b96a4660ee..d5ac5ecb85 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -46,7 +46,7 @@
   import AlbumListItemDetails from './album-list-item-details.svelte';
   import Portal from '$lib/components/shared-components/portal/portal.svelte';
   import { getMetadataSearchQuery } from '$lib/utils/metadata-search';
-  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
+  import { faceManager } from '$lib/managers/face.manager.svelte';
 
   interface Props {
     asset: AssetResponseDto;
@@ -207,7 +207,7 @@
             padding="1"
             size="20"
             buttonSize="32"
-            onclick={() => (isFaceEditMode.value = !isFaceEditMode.value)}
+            onclick={() => (faceManager.isEditMode = !faceManager.isEditMode)}
           />
 
           {#if people.length > 0 || unassignedFaces.length > 0}
diff --git a/web/src/lib/components/asset-viewer/download-panel.svelte b/web/src/lib/components/asset-viewer/download-panel.svelte
index 80a14a5ac3..210d2c9807 100644
--- a/web/src/lib/components/asset-viewer/download-panel.svelte
+++ b/web/src/lib/components/asset-viewer/download-panel.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { type DownloadProgress, downloadManager, downloadStore } from '$lib/stores/download-store.svelte';
+  import { downloadManager, type DownloadProgress } from '$lib/managers/download.manager.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { fly, slide } from 'svelte/transition';
   import { getByteUnitString } from '../../utils/byte-units';
@@ -13,15 +13,15 @@
   };
 </script>
 
-{#if downloadStore.isDownloading}
+{#if downloadManager.isDownloading}
   <div
     transition:fly={{ x: -100, duration: 350 }}
     class="fixed bottom-10 left-2 z-[10000] max-h-[270px] w-[315px] rounded-2xl border bg-immich-bg p-4 text-sm shadow-sm"
   >
     <p class="mb-2 text-xs text-gray-500">{$t('downloading').toUpperCase()}</p>
     <div class="my-2 mb-2 flex max-h-[200px] flex-col overflow-y-auto text-sm">
-      {#each Object.keys(downloadStore.assets) as downloadKey (downloadKey)}
-        {@const download = downloadStore.assets[downloadKey]}
+      {#each Object.keys(downloadManager.assets) as downloadKey (downloadKey)}
+        {@const download = downloadManager.assets[downloadKey]}
         <div class="mb-2 flex place-items-center" transition:slide>
           <div class="w-full pr-10">
             <div class="flex place-items-center justify-between gap-2 text-xs font-medium">
diff --git a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
index c50c21bef8..4ab28a1958 100644
--- a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
+++ b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
@@ -2,7 +2,6 @@
   import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';
   import { dialogController } from '$lib/components/shared-components/dialog/dialog';
   import { notificationController } from '$lib/components/shared-components/notification/notification';
-  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
   import { getPeopleThumbnailUrl } from '$lib/utils';
   import { getAllPeople, createFace, type PersonResponseDto } from '@immich/sdk';
   import { Button, Input } from '@immich/ui';
@@ -10,6 +9,7 @@
   import { onMount } from 'svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { handleError } from '$lib/utils/handle-error';
+  import { faceManager } from '$lib/managers/face.manager.svelte';
 
   interface Props {
     htmlElement: HTMLImageElement | HTMLVideoElement;
@@ -140,7 +140,7 @@
   };
 
   const cancel = () => {
-    isFaceEditMode.value = false;
+    faceManager.isEditMode = false;
   };
 
   const getPeople = async () => {
@@ -303,7 +303,7 @@
     } catch (error) {
       handleError(error, 'Error tagging face');
     } finally {
-      isFaceEditMode.value = false;
+      faceManager.isEditMode = false;
     }
   };
 </script>
diff --git a/web/src/lib/components/asset-viewer/photo-viewer.svelte b/web/src/lib/components/asset-viewer/photo-viewer.svelte
index d3a9da3633..eb159a96fc 100644
--- a/web/src/lib/components/asset-viewer/photo-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte
@@ -20,7 +20,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import FaceEditor from '$lib/components/asset-viewer/face-editor/face-editor.svelte';
   import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';
-  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
+  import { faceManager } from '$lib/managers/face.manager.svelte';
 
   interface Props {
     asset: AssetResponseDto;
@@ -109,7 +109,7 @@
   };
 
   $effect(() => {
-    if (isFaceEditMode.value && $photoZoomState.currentZoom > 1) {
+    if (faceManager.isEditMode && $photoZoomState.currentZoom > 1) {
       zoomToggle();
     }
   });
@@ -235,7 +235,7 @@
       {/each}
     </div>
 
-    {#if isFaceEditMode.value}
+    {#if faceManager.isEditMode}
       <FaceEditor htmlElement={$photoViewerImgElement} {containerWidth} {containerHeight} assetId={asset.id} />
     {/if}
   {/if}
diff --git a/web/src/lib/components/asset-viewer/video-native-viewer.svelte b/web/src/lib/components/asset-viewer/video-native-viewer.svelte
index 07760b3c6b..6fba2fa2ca 100644
--- a/web/src/lib/components/asset-viewer/video-native-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/video-native-viewer.svelte
@@ -9,8 +9,8 @@
   import type { SwipeCustomEvent } from 'svelte-gestures';
   import { fade } from 'svelte/transition';
   import { t } from 'svelte-i18n';
-  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
   import FaceEditor from '$lib/components/asset-viewer/face-editor/face-editor.svelte';
+  import { faceManager } from '$lib/managers/face.manager.svelte';
 
   interface Props {
     assetId: string;
@@ -94,7 +94,7 @@
   let containerHeight = $state(0);
 
   $effect(() => {
-    if (isFaceEditMode.value) {
+    if (faceManager.isEditMode) {
       videoPlayer?.pause();
     }
   });
@@ -141,7 +141,7 @@
     </div>
   {/if}
 
-  {#if isFaceEditMode.value}
+  {#if faceManager.isEditMode}
     <FaceEditor htmlElement={videoPlayer} {containerWidth} {containerHeight} {assetId} />
   {/if}
 </div>
diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte
index 36ccf3f7dc..049ad920ad 100644
--- a/web/src/lib/components/share-page/individual-shared-viewer.svelte
+++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte
@@ -2,7 +2,6 @@
   import { goto } from '$app/navigation';
   import type { Action } from '$lib/components/asset-viewer/actions/action';
   import { AppRoute, AssetAction } from '$lib/constants';
-  import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
   import { getKey, handlePromiseError } from '$lib/utils';
   import { downloadArchive } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
@@ -22,6 +21,7 @@
   import type { Viewport } from '$lib/stores/assets-store.svelte';
   import { t } from 'svelte-i18n';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
+  import { dragAndDropManager } from '$lib/managers/drag-and-drop.manager.svelte';
 
   interface Props {
     sharedLink: SharedLinkResponseDto;
@@ -35,10 +35,10 @@
 
   let assets = $derived(sharedLink.assets);
 
-  dragAndDropFilesStore.subscribe((value) => {
-    if (value.isDragging && value.files.length > 0) {
-      handlePromiseError(handleUploadAssets(value.files));
-      dragAndDropFilesStore.set({ isDragging: false, files: [] });
+  $effect(() => {
+    if (dragAndDropManager.isDragging && dragAndDropManager.files.length > 0) {
+      handlePromiseError(handleUploadAssets(dragAndDropManager.files));
+      dragAndDropManager.reset();
     }
   });
 
diff --git a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
index a3e12e4f12..4777b73509 100644
--- a/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/button-context-menu.svelte
@@ -6,7 +6,7 @@
     type Padding,
   } from '$lib/components/elements/buttons/circle-icon-button.svelte';
   import ContextMenu from '$lib/components/shared-components/context-menu/context-menu.svelte';
-  import { optionClickCallbackStore, selectedIdStore } from '$lib/stores/context-menu.store';
+  import { contextMenuManager } from '$lib/managers/context-menu.manager.svelte';
   import {
     getContextMenuPositionFromBoundingRect,
     getContextMenuPositionFromEvent,
@@ -97,7 +97,7 @@
     }
     focusButton();
     isOpen = false;
-    $selectedIdStore = undefined;
+    contextMenuManager.selectedId = undefined;
   };
 
   const handleOptionClick = () => {
@@ -124,7 +124,7 @@
 
   $effect(() => {
     if (isOpen) {
-      $optionClickCallbackStore = handleOptionClick;
+      contextMenuManager.optionClickCallback = handleOptionClick;
     }
   });
 </script>
@@ -139,8 +139,8 @@
     isOpen,
     onEscape,
     openDropdown,
-    selectedId: $selectedIdStore,
-    selectionChanged: (id) => ($selectedIdStore = id),
+    selectedId: contextMenuManager.selectedId,
+    selectionChanged: (id) => (contextMenuManager.selectedId = id),
   }}
   onresize={onResize}
   {...restProps}
@@ -178,7 +178,7 @@
       <ContextMenu
         {...contextMenuPosition}
         {direction}
-        ariaActiveDescendant={$selectedIdStore}
+        ariaActiveDescendant={contextMenuManager.selectedId}
         ariaLabelledBy={buttonId}
         bind:menuElement={menuContainer}
         id={menuId}
diff --git a/web/src/lib/components/shared-components/context-menu/menu-option.svelte b/web/src/lib/components/shared-components/context-menu/menu-option.svelte
index b3a6d41018..dc5290fa4c 100644
--- a/web/src/lib/components/shared-components/context-menu/menu-option.svelte
+++ b/web/src/lib/components/shared-components/context-menu/menu-option.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import Icon from '$lib/components/elements/icon.svelte';
   import { generateId } from '$lib/utils/generate-id';
-  import { optionClickCallbackStore, selectedIdStore } from '$lib/stores/context-menu.store';
   import type { Shortcut } from '$lib/actions/shortcut';
   import { shortcutLabel as computeShortcutLabel, shortcut as bindShortcut } from '$lib/actions/shortcut';
+  import { contextMenuManager } from '$lib/managers/context-menu.manager.svelte';
 
   interface Props {
     text: string;
@@ -29,10 +29,10 @@
 
   let id: string = generateId();
 
-  let isActive = $derived($selectedIdStore === id);
+  let isActive = $derived(contextMenuManager.selectedId === id);
 
   const handleClick = () => {
-    $optionClickCallbackStore?.();
+    contextMenuManager.optionClickCallback?.();
     onClick();
   };
 
@@ -51,8 +51,8 @@
 <li
   {id}
   onclick={handleClick}
-  onmouseover={() => ($selectedIdStore = id)}
-  onmouseleave={() => ($selectedIdStore = undefined)}
+  onmouseover={() => (contextMenuManager.selectedId = id)}
+  onmouseleave={() => (contextMenuManager.selectedId = undefined)}
   class="w-full p-4 text-left text-sm font-medium {textColor} focus:outline-none focus:ring-2 focus:ring-inset cursor-pointer border-gray-200 flex gap-2 items-center {isActive
     ? activeColor
     : 'bg-slate-100'}"
diff --git a/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte b/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
index 9b9e68b6c5..08e00c714a 100644
--- a/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/right-click-context-menu.svelte
@@ -4,7 +4,7 @@
   import { shortcuts } from '$lib/actions/shortcut';
   import { generateId } from '$lib/utils/generate-id';
   import { contextMenuNavigation } from '$lib/actions/context-menu-navigation';
-  import { optionClickCallbackStore, selectedIdStore } from '$lib/stores/context-menu.store';
+  import { contextMenuManager } from '$lib/managers/context-menu.manager.svelte';
 
   interface Props {
     title: string;
@@ -60,7 +60,7 @@
     if (isOpen && menuContainer) {
       triggerElement = document.activeElement as HTMLElement;
       menuContainer.focus();
-      $optionClickCallbackStore = closeContextMenu;
+      contextMenuManager.optionClickCallback = closeContextMenu;
     }
   });
 
@@ -77,8 +77,8 @@
         closeDropdown: closeContextMenu,
         container: menuContainer,
         isOpen,
-        selectedId: $selectedIdStore,
-        selectionChanged: (id) => ($selectedIdStore = id),
+        selectedId: contextMenuManager.selectedId,
+        selectionChanged: (id) => (contextMenuManager.selectedId = id),
       }}
       use:shortcuts={[
         {
@@ -96,7 +96,7 @@
           {direction}
           {x}
           {y}
-          ariaActiveDescendant={$selectedIdStore}
+          ariaActiveDescendant={contextMenuManager.selectedId}
           ariaLabel={title}
           bind:menuElement={menuContainer}
           id={menuId}
diff --git a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
index 2ed5d684a4..81aafad4d0 100644
--- a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
+++ b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from '$app/state';
   import { shouldIgnoreEvent } from '$lib/actions/shortcut';
-  import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
+  import { dragAndDropManager } from '$lib/managers/drag-and-drop.manager.svelte';
   import { fileUploadHandler } from '$lib/utils/file-uploader';
   import { isAlbumsRoute, isSharedLinkRoute } from '$lib/utils/navigation';
   import { t } from 'svelte-i18n';
@@ -124,7 +124,8 @@
 
     const filesArray: File[] = Array.from<File>(files);
     if (isShare) {
-      dragAndDropFilesStore.set({ isDragging: true, files: filesArray });
+      dragAndDropManager.isDragging = true;
+      dragAndDropManager.files = filesArray;
     } else {
       await fileUploadHandler(filesArray, albumId);
     }
diff --git a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
index 90f6b3c55b..90d1e8a9e6 100644
--- a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
@@ -10,7 +10,7 @@
   import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
   import SearchBar from '$lib/components/shared-components/search-bar/search-bar.svelte';
   import { AppRoute } from '$lib/constants';
-  import { authManager } from '$lib/stores/auth-manager.svelte';
+  import { authManager } from '$lib/managers/auth-manager.svelte';
   import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { sidebarStore } from '$lib/stores/sidebar.svelte';
diff --git a/web/src/lib/managers/activity.manager.svelte.ts b/web/src/lib/managers/activity.manager.svelte.ts
new file mode 100644
index 0000000000..518a34a86f
--- /dev/null
+++ b/web/src/lib/managers/activity.manager.svelte.ts
@@ -0,0 +1,17 @@
+class ActivityManager {
+  #numberOfComments = $state<number>(0);
+
+  get numberOfComments() {
+    return this.#numberOfComments;
+  }
+
+  set numberOfComments(number: number) {
+    this.#numberOfComments = number;
+  }
+
+  updateNumberOfComments(addOrRemove: 1 | -1) {
+    this.#numberOfComments += addOrRemove;
+  }
+}
+
+export const activityManager = new ActivityManager();
diff --git a/web/src/lib/stores/auth-manager.svelte.ts b/web/src/lib/managers/auth-manager.svelte.ts
similarity index 91%
rename from web/src/lib/stores/auth-manager.svelte.ts
rename to web/src/lib/managers/auth-manager.svelte.ts
index 72c966df0b..c9dfd7dabb 100644
--- a/web/src/lib/stores/auth-manager.svelte.ts
+++ b/web/src/lib/managers/auth-manager.svelte.ts
@@ -1,6 +1,6 @@
 import { goto } from '$app/navigation';
 import { AppRoute } from '$lib/constants';
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 import { logout } from '@immich/sdk';
 
 class AuthManager {
diff --git a/web/src/lib/managers/context-menu.manager.svelte.ts b/web/src/lib/managers/context-menu.manager.svelte.ts
new file mode 100644
index 0000000000..7ac311af90
--- /dev/null
+++ b/web/src/lib/managers/context-menu.manager.svelte.ts
@@ -0,0 +1,22 @@
+class ContextMenuManager {
+  #selectedId = $state<string | undefined>(undefined);
+  #optionClickCallback = $state<(() => void) | undefined>(undefined);
+
+  get selectedId() {
+    return this.#selectedId;
+  }
+
+  set selectedId(id: string | undefined) {
+    this.#selectedId = id;
+  }
+
+  get optionClickCallback() {
+    return this.#optionClickCallback;
+  }
+
+  set optionClickCallback(callback: (() => void) | undefined) {
+    this.#optionClickCallback = callback;
+  }
+}
+
+export const contextMenuManager = new ContextMenuManager();
diff --git a/web/src/lib/managers/download.manager.svelte.ts b/web/src/lib/managers/download.manager.svelte.ts
new file mode 100644
index 0000000000..c20d0c26d2
--- /dev/null
+++ b/web/src/lib/managers/download.manager.svelte.ts
@@ -0,0 +1,47 @@
+export interface DownloadProgress {
+  progress: number;
+  total: number;
+  percentage: number;
+  abort: AbortController | null;
+}
+
+class DownloadManager {
+  #assets = $state<Record<string, DownloadProgress>>({});
+  #isDownloading = $derived(Object.keys(this.#assets).length > 0);
+
+  #update(key: string, value: Partial<DownloadProgress>) {
+    if (!this.#assets[key]) {
+      this.#assets[key] = { progress: 0, total: 0, percentage: 0, abort: null };
+    }
+
+    const item = this.#assets[key];
+    Object.assign(item, value);
+    item.percentage = Math.min(Math.floor((item.progress / item.total) * 100), 100);
+  }
+
+  get assets() {
+    return this.#assets;
+  }
+
+  get isDownloading() {
+    return this.#isDownloading;
+  }
+
+  add(key: string, total: number, abort?: AbortController) {
+    this.#update(key, { total, abort });
+  }
+
+  clear(key: string) {
+    delete this.#assets[key];
+  }
+
+  update(key: string, progress: number, total?: number) {
+    const download: Partial<DownloadProgress> = { progress };
+    if (total !== undefined) {
+      download.total = total;
+    }
+    this.#update(key, download);
+  }
+}
+
+export const downloadManager = new DownloadManager();
diff --git a/web/src/lib/managers/drag-and-drop.manager.svelte.ts b/web/src/lib/managers/drag-and-drop.manager.svelte.ts
new file mode 100644
index 0000000000..2834120a12
--- /dev/null
+++ b/web/src/lib/managers/drag-and-drop.manager.svelte.ts
@@ -0,0 +1,27 @@
+class DragAndDropManager {
+  #isDragging = $state<boolean>(false);
+  #files = $state<File[]>([]);
+
+  get isDragging() {
+    return this.#isDragging;
+  }
+
+  get files() {
+    return this.#files;
+  }
+
+  set isDragging(isDragging: boolean) {
+    this.#isDragging = isDragging;
+  }
+
+  set files(files: File[]) {
+    this.#files = files;
+  }
+
+  reset() {
+    this.#isDragging = false;
+    this.#files = [];
+  }
+}
+
+export const dragAndDropManager = new DragAndDropManager();
diff --git a/web/src/lib/stores/event-manager.svelte.ts b/web/src/lib/managers/event.manager.svelte.ts
similarity index 100%
rename from web/src/lib/stores/event-manager.svelte.ts
rename to web/src/lib/managers/event.manager.svelte.ts
diff --git a/web/src/lib/managers/face.manager.svelte.ts b/web/src/lib/managers/face.manager.svelte.ts
new file mode 100644
index 0000000000..199b33d3cf
--- /dev/null
+++ b/web/src/lib/managers/face.manager.svelte.ts
@@ -0,0 +1,13 @@
+class FaceManager {
+  #isEditMode = $state(false);
+
+  get isEditMode() {
+    return this.#isEditMode;
+  }
+
+  set isEditMode(isEditMode: boolean) {
+    this.#isEditMode = isEditMode;
+  }
+}
+
+export const faceManager = new FaceManager();
diff --git a/web/src/lib/stores/activity.store.ts b/web/src/lib/stores/activity.store.ts
deleted file mode 100644
index 897f835063..0000000000
--- a/web/src/lib/stores/activity.store.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const numberOfComments = writable<number>(0);
-
-export const setNumberOfComments = (number: number) => {
-  numberOfComments.set(number);
-};
-
-export const updateNumberOfComments = (addOrRemove: 1 | -1) => {
-  numberOfComments.update((n) => n + addOrRemove);
-};
diff --git a/web/src/lib/stores/context-menu.store.ts b/web/src/lib/stores/context-menu.store.ts
deleted file mode 100644
index 534c15bd47..0000000000
--- a/web/src/lib/stores/context-menu.store.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { writable } from 'svelte/store';
-
-const selectedIdStore = writable<string | undefined>(undefined);
-const optionClickCallbackStore = writable<(() => void) | undefined>(undefined);
-
-export { optionClickCallbackStore, selectedIdStore };
diff --git a/web/src/lib/stores/download-store.svelte.ts b/web/src/lib/stores/download-store.svelte.ts
deleted file mode 100644
index 8c03671e73..0000000000
--- a/web/src/lib/stores/download-store.svelte.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export interface DownloadProgress {
-  progress: number;
-  total: number;
-  percentage: number;
-  abort: AbortController | null;
-}
-
-class DownloadStore {
-  assets = $state<Record<string, DownloadProgress>>({});
-
-  isDownloading = $derived(Object.keys(this.assets).length > 0);
-
-  #update(key: string, value: Partial<DownloadProgress> | null) {
-    if (value === null) {
-      delete this.assets[key];
-      return;
-    }
-
-    if (!this.assets[key]) {
-      this.assets[key] = { progress: 0, total: 0, percentage: 0, abort: null };
-    }
-
-    const item = this.assets[key];
-    Object.assign(item, value);
-    item.percentage = Math.min(Math.floor((item.progress / item.total) * 100), 100);
-  }
-
-  add(key: string, total: number, abort?: AbortController) {
-    this.#update(key, { total, abort });
-  }
-
-  clear(key: string) {
-    this.#update(key, null);
-  }
-
-  update(key: string, progress: number, total?: number) {
-    const download: Partial<DownloadProgress> = { progress };
-    if (total !== undefined) {
-      download.total = total;
-    }
-    this.#update(key, download);
-  }
-}
-
-export const downloadStore = new DownloadStore();
-
-export const downloadManager = {
-  add: (key: string, total: number, abort?: AbortController) => downloadStore.add(key, total, abort),
-  clear: (key: string) => downloadStore.clear(key),
-  update: (key: string, progress: number, total?: number) => downloadStore.update(key, progress, total),
-};
diff --git a/web/src/lib/stores/drag-and-drop-files.store.ts b/web/src/lib/stores/drag-and-drop-files.store.ts
deleted file mode 100644
index 1b8733aa8b..0000000000
--- a/web/src/lib/stores/drag-and-drop-files.store.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-//store to track the state of the drag and drop and the files
-import { writable } from 'svelte/store';
-
-export const dragAndDropFilesStore = writable({
-  isDragging: false as boolean,
-  files: [] as File[],
-});
diff --git a/web/src/lib/stores/face-edit.svelte.ts b/web/src/lib/stores/face-edit.svelte.ts
deleted file mode 100644
index 0b2f436099..0000000000
--- a/web/src/lib/stores/face-edit.svelte.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const isFaceEditMode = $state({ value: false });
diff --git a/web/src/lib/stores/folders.svelte.ts b/web/src/lib/stores/folders.svelte.ts
index c6fc7808b2..acb0153bb3 100644
--- a/web/src/lib/stores/folders.svelte.ts
+++ b/web/src/lib/stores/folders.svelte.ts
@@ -1,4 +1,4 @@
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 import {
   getAssetsByOriginalPath,
   getUniqueOriginalPaths,
diff --git a/web/src/lib/stores/memory.store.svelte.ts b/web/src/lib/stores/memory.store.svelte.ts
index ef3f87a3aa..2cb18cde2c 100644
--- a/web/src/lib/stores/memory.store.svelte.ts
+++ b/web/src/lib/stores/memory.store.svelte.ts
@@ -1,4 +1,4 @@
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 import { asLocalTimeISO } from '$lib/utils/date-time';
 import {
   type AssetResponseDto,
diff --git a/web/src/lib/stores/search.svelte.ts b/web/src/lib/stores/search.svelte.ts
index f334f53460..23442ef99b 100644
--- a/web/src/lib/stores/search.svelte.ts
+++ b/web/src/lib/stores/search.svelte.ts
@@ -1,4 +1,4 @@
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 
 class SearchStore {
   savedSearchTerms = $state<string[]>([]);
diff --git a/web/src/lib/stores/user.store.ts b/web/src/lib/stores/user.store.ts
index fe2288c252..29f9286556 100644
--- a/web/src/lib/stores/user.store.ts
+++ b/web/src/lib/stores/user.store.ts
@@ -1,4 +1,4 @@
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 import { purchaseStore } from '$lib/stores/purchase.store';
 import { type UserAdminResponseDto, type UserPreferencesResponseDto } from '@immich/sdk';
 import { writable } from 'svelte/store';
diff --git a/web/src/lib/stores/user.svelte.ts b/web/src/lib/stores/user.svelte.ts
index 093d90e4b5..cf5bb16bc3 100644
--- a/web/src/lib/stores/user.svelte.ts
+++ b/web/src/lib/stores/user.svelte.ts
@@ -1,4 +1,4 @@
-import { eventManager } from '$lib/stores/event-manager.svelte';
+import { eventManager } from '$lib/managers/event.manager.svelte';
 import type {
   AlbumResponseDto,
   ServerAboutResponseDto,
diff --git a/web/src/lib/stores/websocket.ts b/web/src/lib/stores/websocket.ts
index 90228a5cbd..00df88c4bb 100644
--- a/web/src/lib/stores/websocket.ts
+++ b/web/src/lib/stores/websocket.ts
@@ -1,4 +1,4 @@
-import { authManager } from '$lib/stores/auth-manager.svelte';
+import { authManager } from '$lib/managers/auth-manager.svelte';
 import { createEventEmitter } from '$lib/utils/eventemitter';
 import type { AssetResponseDto, ServerVersionResponseDto } from '@immich/sdk';
 import { io, type Socket } from 'socket.io-client';
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index bd3cb416b5..e733721cd8 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -3,9 +3,9 @@ import FormatBoldMessage from '$lib/components/i18n/format-bold-message.svelte';
 import type { InterpolationValues } from '$lib/components/i18n/format-message';
 import { NotificationType, notificationController } from '$lib/components/shared-components/notification/notification';
 import { AppRoute } from '$lib/constants';
+import { downloadManager } from '$lib/managers/download.manager.svelte';
 import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
 import { assetsSnapshot, isSelectingAllAssets, type AssetStore } from '$lib/stores/assets-store.svelte';
-import { downloadManager } from '$lib/stores/download-store.svelte';
 import { preferences } from '$lib/stores/user.store';
 import { downloadRequest, getKey, withError } from '$lib/utils';
 import { createAlbum } from '$lib/utils/album-utils';
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 818f48fe4a..11ac1c9642 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
@@ -34,7 +34,6 @@
   } from '$lib/components/shared-components/notification/notification';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import { AppRoute, AlbumPageViewMode } from '$lib/constants';
-  import { numberOfComments, setNumberOfComments, updateNumberOfComments } from '$lib/stores/activity.store';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { AssetStore } from '$lib/stores/assets-store.svelte';
   import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
@@ -87,6 +86,7 @@
   import { confirmAlbumDelete } from '$lib/utils/album-utils';
   import TagAction from '$lib/components/photos-page/actions/tag-action.svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
+  import { activityManager } from '$lib/managers/activity.manager.svelte';
 
   interface Props {
     data: PageData;
@@ -191,7 +191,7 @@
   const getNumberOfComments = async () => {
     try {
       const { comments } = await getActivityStatistics({ albumId: album.id });
-      setNumberOfComments(comments);
+      activityManager.numberOfComments = comments;
     } catch (error) {
       handleError(error, $t('errors.cant_get_number_of_comments'));
     }
@@ -398,7 +398,7 @@
   let albumId = $derived(album.id);
 
   $effect(() => {
-    if (!album.isActivityEnabled && $numberOfComments === 0) {
+    if (!album.isActivityEnabled && activityManager.numberOfComments === 0) {
       isShowActivity = false;
     }
   });
@@ -420,7 +420,9 @@
   let isOwned = $derived($user.id == album.ownerId);
 
   let showActivityStatus = $derived(
-    album.albumUsers.length > 0 && !$showAssetViewer && (album.isActivityEnabled || $numberOfComments > 0),
+    album.albumUsers.length > 0 &&
+      !$showAssetViewer &&
+      (album.isActivityEnabled || activityManager.numberOfComments > 0),
   );
   let isEditor = $derived(
     album.albumUsers.find(({ user: { id } }) => id === $user.id)?.role === AlbumUserRole.Editor ||
@@ -712,7 +714,7 @@
           <ActivityStatus
             disabled={!album.isActivityEnabled}
             {isLiked}
-            numberOfComments={$numberOfComments}
+            numberOfComments={activityManager.numberOfComments}
             onFavorite={handleFavorite}
             onOpenActivityTab={handleOpenAndCloseActivityTab}
           />
@@ -735,8 +737,8 @@
           albumId={album.id}
           {isLiked}
           bind:reactions
-          onAddComment={() => updateNumberOfComments(1)}
-          onDeleteComment={() => updateNumberOfComments(-1)}
+          onAddComment={() => activityManager.updateNumberOfComments(1)}
+          onDeleteComment={() => activityManager.updateNumberOfComments(-1)}
           onDeleteLike={() => (isLiked = null)}
           onClose={handleOpenAndCloseActivityTab}
         />
diff --git a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
index 34498a60a3..d9cc4ce106 100644
--- a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
@@ -20,10 +20,10 @@
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
   import { AssetAction } from '$lib/constants';
+  import { faceManager } from '$lib/managers/face.manager.svelte';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { AssetStore } from '$lib/stores/assets-store.svelte';
-  import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
   import { preferences, user } from '$lib/stores/user.store';
   import {
     updateStackedAssetInTimeline,
@@ -76,7 +76,7 @@
   };
 
   beforeNavigate(() => {
-    isFaceEditMode.value = false;
+    faceManager.isEditMode = false;
   });
 </script>
 
diff --git a/web/src/routes/admin/repair/+page.svelte b/web/src/routes/admin/repair/+page.svelte
index 635a140452..384853d8da 100644
--- a/web/src/routes/admin/repair/+page.svelte
+++ b/web/src/routes/admin/repair/+page.svelte
@@ -7,7 +7,6 @@
     NotificationType,
     notificationController,
   } from '$lib/components/shared-components/notification/notification';
-  import { downloadManager } from '$lib/stores/download-store.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { copyToClipboard } from '$lib/utils';
   import { downloadBlob } from '$lib/utils/asset-utils';
@@ -17,6 +16,7 @@
   import { mdiCheckAll, mdiContentCopy, mdiDownload, mdiRefresh, mdiWrench } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
+  import { downloadManager } from '$lib/managers/download.manager.svelte';
 
   interface Props {
     data: PageData;
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index 6512461ee9..769a585434 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -22,7 +22,6 @@
   import SettingAccordionState from '$lib/components/shared-components/settings/setting-accordion-state.svelte';
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
   import { QueryParameter } from '$lib/constants';
-  import { downloadManager } from '$lib/stores/download-store.svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { copyToClipboard } from '$lib/utils';
   import { downloadBlob } from '$lib/utils/asset-utils';
@@ -53,6 +52,7 @@
   import type { Component } from 'svelte';
   import type { SettingsComponentProps } from '$lib/components/admin-page/settings/admin-settings';
   import SearchBar from '$lib/components/elements/search-bar.svelte';
+  import { downloadManager } from '$lib/managers/download.manager.svelte';
 
   interface Props {
     data: PageData;
diff --git a/web/src/routes/auth/change-password/+page.svelte b/web/src/routes/auth/change-password/+page.svelte
index 16a6ffc677..aacf9a2c35 100644
--- a/web/src/routes/auth/change-password/+page.svelte
+++ b/web/src/routes/auth/change-password/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AuthPageLayout from '$lib/components/layouts/AuthPageLayout.svelte';
-  import { authManager } from '$lib/stores/auth-manager.svelte';
+  import { authManager } from '$lib/managers/auth-manager.svelte';
   import { user } from '$lib/stores/user.store';
   import { updateMyUser } from '@immich/sdk';
   import { Alert, Button, Field, HelperText, PasswordInput, Stack, Text } from '@immich/ui';