diff --git a/src/app/MainApp.tsx b/src/app/MainApp.tsx
index 232ca1c4..d2c92f67 100644
--- a/src/app/MainApp.tsx
+++ b/src/app/MainApp.tsx
@@ -24,7 +24,7 @@ import { initMiniPlayerBridgeOnMain } from '@/features/miniPlayer';
 import { runAdvancedModeMigration } from '../utils/migrations/advancedModeMigration';
 import { bootstrapAllIndexedServers } from '@/lib/library/librarySession';
 import { hydrateQueueFromIndex } from '@/features/playback/store/queueRestore';
-import { useLibraryAnalysisBackfill } from '../hooks/useLibraryAnalysisBackfill';
+import { useLibraryAnalysisBackfill } from '@/lib/library/hooks/useLibraryAnalysisBackfill';
 import { useCoverArtPrefetch } from '../cover/useCoverArtPrefetch';
 import { useLibraryCoverBackfill } from '../hooks/useLibraryCoverBackfill';
 import { useCoverRevalidateScheduler } from '../cover/useCoverRevalidateScheduler';
diff --git a/src/features/artist/pages/Artists.tsx b/src/features/artist/pages/Artists.tsx
index b6d44eea..16a54386 100644
--- a/src/features/artist/pages/Artists.tsx
+++ b/src/features/artist/pages/Artists.tsx
@@ -21,7 +21,7 @@ import {
   ARTIST_LIST_ROW_EST,
 } from '@/features/artist/utils/artistsHelpers';
 import { useArtistsFiltering } from '@/features/artist/hooks/useArtistsFiltering';
-import { useLibraryIgnoredArticles } from '@/hooks/useLibraryIgnoredArticles';
+import { useLibraryIgnoredArticles } from '@/lib/library/hooks/useLibraryIgnoredArticles';
 import { useArtistsBrowseCatalog } from '@/features/artist/hooks/useArtistsBrowseCatalog';
 import { useBrowseArtistTextSearch } from '@/features/artist/hooks/useBrowseArtistTextSearch';
 import { useMainstageInpageHeaderTight } from '@/lib/hooks/useMainstageInpageHeaderTight';
diff --git a/src/features/composers/pages/Composers.tsx b/src/features/composers/pages/Composers.tsx
index 99ea5836..40a0d1ab 100644
--- a/src/features/composers/pages/Composers.tsx
+++ b/src/features/composers/pages/Composers.tsx
@@ -21,7 +21,7 @@ import { useScopedBrowseSearchQuery } from '@/store/liveSearchScopeStore';
 import { readComposerBrowseRestore } from '@/utils/navigation/albumDetailNavigation';
 import { filterArtistsWithRoleAlbumCredits } from '@/lib/library/composerBrowse';
 import { ALL_SENTINEL, artistLetterBucket } from '@/features/artist';
-import { useLibraryIgnoredArticles } from '@/hooks/useLibraryIgnoredArticles';
+import { useLibraryIgnoredArticles } from '@/lib/library/hooks/useLibraryIgnoredArticles';
 import { usePerfProbeFlags } from '@/utils/perf/perfFlags';
 import { VirtualCardGrid } from '@/ui/VirtualCardGrid';
 import OverlayScrollArea from '@/ui/OverlayScrollArea';
diff --git a/src/features/settings/components/ServerLibraryIndexControls.tsx b/src/features/settings/components/ServerLibraryIndexControls.tsx
index c3f0bf96..c476f049 100644
--- a/src/features/settings/components/ServerLibraryIndexControls.tsx
+++ b/src/features/settings/components/ServerLibraryIndexControls.tsx
@@ -5,7 +5,7 @@ import {
   libraryStatusDisplayTrackCount,
   libraryStatusIsReady,
 } from '@/lib/library/libraryReady';
-import type { LibraryServerConnection } from '@/hooks/useLibraryIndexSync';
+import type { LibraryServerConnection } from '@/lib/library/hooks/useLibraryIndexSync';
 
 interface ServerLibraryIndexControlsProps {
   status: SyncStateDto | null;
diff --git a/src/features/settings/components/ServersTab.tsx b/src/features/settings/components/ServersTab.tsx
index e669fc0b..05816375 100644
--- a/src/features/settings/components/ServersTab.tsx
+++ b/src/features/settings/components/ServersTab.tsx
@@ -9,7 +9,7 @@ import { buildCapabilityContext } from '@/serverCapabilities/context';
 import { useLibraryIndexStore } from '@/store/libraryIndexStore';
 import { libraryDeleteServerData, librarySyncClearSession } from '@/lib/api/library';
 import { bootstrapIndexedServer } from '@/lib/library/librarySession';
-import { useLibraryIndexSync } from '@/hooks/useLibraryIndexSync';
+import { useLibraryIndexSync } from '@/lib/library/hooks/useLibraryIndexSync';
 import ServerLibraryIndexControls from '@/features/settings/components/ServerLibraryIndexControls';
 import type { ServerProfile } from '@/store/authStoreTypes';
 import { pingWithCredentialsForProfile, scheduleInstantMixProbeForServer } from '@/lib/api/subsonic';
diff --git a/src/hooks/useLibraryAnalysisBackfill.ts b/src/lib/library/hooks/useLibraryAnalysisBackfill.ts
similarity index 90%
rename from src/hooks/useLibraryAnalysisBackfill.ts
rename to src/lib/library/hooks/useLibraryAnalysisBackfill.ts
index 69b4f33e..536bcd0f 100644
--- a/src/hooks/useLibraryAnalysisBackfill.ts
+++ b/src/lib/library/hooks/useLibraryAnalysisBackfill.ts
@@ -2,12 +2,12 @@ import { useEffect } from 'react';
 import {
   analysisSetPipelineParallelism,
   libraryAnalysisBackfillConfigure,
-} from '../api/analysis';
-import { librarySqlServerId } from '../api/coverCache';
-import { useAuthStore } from '../store/authStore';
-import { useAnalysisStrategyStore } from '../store/analysisStrategyStore';
+} from '@/api/analysis';
+import { librarySqlServerId } from '@/api/coverCache';
+import { useAuthStore } from '@/store/authStore';
+import { useAnalysisStrategyStore } from '@/store/analysisStrategyStore';
 import { DEFAULT_ADVANCED_PARALLELISM } from '@/lib/library/analysisStrategy';
-import { serverIndexKeyForProfile } from '../utils/server/serverIndexKey';
+import { serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
 
 const DISABLED_CONFIGURE = {
   enabled: false,
diff --git a/src/hooks/useLibraryIgnoredArticles.ts b/src/lib/library/hooks/useLibraryIgnoredArticles.ts
similarity index 100%
rename from src/hooks/useLibraryIgnoredArticles.ts
rename to src/lib/library/hooks/useLibraryIgnoredArticles.ts
diff --git a/src/hooks/useLibraryIndexSync.ts b/src/lib/library/hooks/useLibraryIndexSync.ts
similarity index 97%
rename from src/hooks/useLibraryIndexSync.ts
rename to src/lib/library/hooks/useLibraryIndexSync.ts
index 37dfe185..974e65ae 100644
--- a/src/hooks/useLibraryIndexSync.ts
+++ b/src/lib/library/hooks/useLibraryIndexSync.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useAuthStore } from '../store/authStore';
-import { useLibraryIndexStore } from '../store/libraryIndexStore';
-import { showToast } from '../utils/ui/toast';
-import { resolveIndexKey, serverIndexKeyForProfile } from '../utils/server/serverIndexKey';
+import { useAuthStore } from '@/store/authStore';
+import { useLibraryIndexStore } from '@/store/libraryIndexStore';
+import { showToast } from '@/utils/ui/toast';
+import { resolveIndexKey, serverIndexKeyForProfile } from '@/utils/server/serverIndexKey';
 import {
   libraryGetStatus,
   librarySyncCancel,
diff --git a/src/hooks/useEnrichmentPrimaryIcon.ts b/src/music-network/ui/useEnrichmentPrimaryIcon.ts
similarity index 100%
rename from src/hooks/useEnrichmentPrimaryIcon.ts
rename to src/music-network/ui/useEnrichmentPrimaryIcon.ts
diff --git a/src/hooks/useEnrichmentPrimaryLabel.ts b/src/music-network/ui/useEnrichmentPrimaryLabel.ts
similarity index 100%
rename from src/hooks/useEnrichmentPrimaryLabel.ts
rename to src/music-network/ui/useEnrichmentPrimaryLabel.ts