diff --git a/src/features/orbit/components/OrbitHelpModal.tsx b/src/features/orbit/components/OrbitHelpModal.tsx
index d662b114..99011bc9 100644
--- a/src/features/orbit/components/OrbitHelpModal.tsx
+++ b/src/features/orbit/components/OrbitHelpModal.tsx
@@ -5,7 +5,7 @@ import {
   ListMusic, Inbox, Sliders, LogOut,
 } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
-import { useHelpModalStore } from '@/store/helpModalStore';
+import { useHelpModalStore } from '@/features/orbit/store/helpModalStore';
 import { SettingsSubSection } from '@/features/settings';
 
 /**
diff --git a/src/features/orbit/components/OrbitSessionBar.tsx b/src/features/orbit/components/OrbitSessionBar.tsx
index ff778a75..7b245c4d 100644
--- a/src/features/orbit/components/OrbitSessionBar.tsx
+++ b/src/features/orbit/components/OrbitSessionBar.tsx
@@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from 'react';
 import { X, RefreshCw, Shuffle, Settings2, Share2, HelpCircle, Activity } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 import { useOrbitStore } from '@/features/orbit/store/orbitStore';
-import { useHelpModalStore } from '@/store/helpModalStore';
+import { useHelpModalStore } from '@/features/orbit/store/helpModalStore';
 import { usePlayerStore } from '@/features/playback/store/playerStore';
 import {
   endOrbitSession,
diff --git a/src/features/orbit/components/OrbitStartTrigger.tsx b/src/features/orbit/components/OrbitStartTrigger.tsx
index 878f9bfb..46362793 100644
--- a/src/features/orbit/components/OrbitStartTrigger.tsx
+++ b/src/features/orbit/components/OrbitStartTrigger.tsx
@@ -4,7 +4,7 @@ import { Orbit as OrbitIcon, Plus, LogIn, HelpCircle } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 import { useOrbitStore } from '@/features/orbit/store/orbitStore';
 import { useAuthStore } from '@/store/authStore';
-import { useHelpModalStore } from '@/store/helpModalStore';
+import { useHelpModalStore } from '@/features/orbit/store/helpModalStore';
 import OrbitStartModal from '@/features/orbit/components/OrbitStartModal';
 import OrbitJoinModal from '@/features/orbit/components/OrbitJoinModal';
 import OrbitWordmark from '@/features/orbit/components/OrbitWordmark';
diff --git a/src/store/helpModalStore.ts b/src/features/orbit/store/helpModalStore.ts
similarity index 100%
rename from src/store/helpModalStore.ts
rename to src/features/orbit/store/helpModalStore.ts
diff --git a/src/features/playback/components/PlayerBar.tsx b/src/features/playback/components/PlayerBar.tsx
index 3f546261..9f093980 100644
--- a/src/features/playback/components/PlayerBar.tsx
+++ b/src/features/playback/components/PlayerBar.tsx
@@ -35,7 +35,7 @@ import { useUtilityOverflowMenu } from '@/features/playback/hooks/useUtilityOver
 import {
   usePlayerBarLayoutStore,
   type PlayerBarLayoutItemId,
-} from '@/store/playerBarLayoutStore';
+} from '@/features/playback/store/playerBarLayoutStore';
 
 export default function PlayerBar() {
   const { t } = useTranslation();
diff --git a/src/features/playback/components/playerBar/PlayerOverflowMenu.tsx b/src/features/playback/components/playerBar/PlayerOverflowMenu.tsx
index b616535e..39ecab5a 100644
--- a/src/features/playback/components/playerBar/PlayerOverflowMenu.tsx
+++ b/src/features/playback/components/playerBar/PlayerOverflowMenu.tsx
@@ -8,7 +8,7 @@ import { PlayerPlaybackRateMenuSection } from '@/features/playback/components/pl
 import {
   usePlayerBarLayoutStore,
   type PlayerBarLayoutItemId,
-} from '@/store/playerBarLayoutStore';
+} from '@/features/playback/store/playerBarLayoutStore';
 
 interface Props {
   utilityMenuRef: React.RefObject<HTMLDivElement | null>;
diff --git a/src/features/playback/components/playerBar/PlayerTrackInfo.tsx b/src/features/playback/components/playerBar/PlayerTrackInfo.tsx
index 76261489..eb9f4b54 100644
--- a/src/features/playback/components/playerBar/PlayerTrackInfo.tsx
+++ b/src/features/playback/components/playerBar/PlayerTrackInfo.tsx
@@ -19,7 +19,7 @@ import { renderPresetIcon, useEnrichmentPrimaryIcon, useEnrichmentPrimaryLabel }
 import {
   usePlayerBarLayoutStore,
   type PlayerBarLayoutItemId,
-} from '@/store/playerBarLayoutStore';
+} from '@/features/playback/store/playerBarLayoutStore';
 import { useOfflineBrowseContext } from '@/features/offline';
 import { offlineActionPolicy } from '@/features/offline';
 
diff --git a/src/features/playback/store/audioEventHandlers.ts b/src/features/playback/store/audioEventHandlers.ts
index a35e06d7..97cabbc9 100644
--- a/src/features/playback/store/audioEventHandlers.ts
+++ b/src/features/playback/store/audioEventHandlers.ts
@@ -9,7 +9,7 @@ import { resolveQueueTrack } from '@/features/playback/store/queueTrackView';
 import { invoke } from '@tauri-apps/api/core';
 import { getMusicNetworkRuntimeOrNull } from '@/music-network';
 import { setDeferHotCachePrefetch } from '@/utils/cache/hotCacheGate';
-import { notifyLibraryPlaybackHint } from '@/store/libraryPlaybackHint';
+import { notifyLibraryPlaybackHint } from '@/features/playback/store/libraryPlaybackHint';
 import {
   playListenSessionFinalize,
   playListenSessionOnProgress,
diff --git a/src/store/libraryPlaybackHint.ts b/src/features/playback/store/libraryPlaybackHint.ts
similarity index 88%
rename from src/store/libraryPlaybackHint.ts
rename to src/features/playback/store/libraryPlaybackHint.ts
index 49d29c23..274f2168 100644
--- a/src/store/libraryPlaybackHint.ts
+++ b/src/features/playback/store/libraryPlaybackHint.ts
@@ -1,6 +1,6 @@
 import { librarySetPlaybackHint, type PlaybackHint } from '@/lib/api/library';
-import { useAuthStore } from './authStore';
-import { useLibraryIndexStore } from './libraryIndexStore';
+import { useAuthStore } from '@/store/authStore';
+import { useLibraryIndexStore } from '@/store/libraryIndexStore';
 
 /**
  * Bridge from the audio lifecycle to the Rust library scheduler's
diff --git a/src/store/playerBarLayoutStore.test.ts b/src/features/playback/store/playerBarLayoutStore.test.ts
similarity index 95%
rename from src/store/playerBarLayoutStore.test.ts
rename to src/features/playback/store/playerBarLayoutStore.test.ts
index f42eb493..2ef0a396 100644
--- a/src/store/playerBarLayoutStore.test.ts
+++ b/src/features/playback/store/playerBarLayoutStore.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it, beforeEach } from 'vitest';
 import {
   DEFAULT_PLAYER_BAR_LAYOUT_ITEMS,
   usePlayerBarLayoutStore,
-} from './playerBarLayoutStore';
+} from '@/features/playback/store/playerBarLayoutStore';
 
 describe('playerBarLayoutStore', () => {
   beforeEach(() => {
diff --git a/src/store/playerBarLayoutStore.ts b/src/features/playback/store/playerBarLayoutStore.ts
similarity index 100%
rename from src/store/playerBarLayoutStore.ts
rename to src/features/playback/store/playerBarLayoutStore.ts
diff --git a/src/features/settings/components/PersonalisationTab.tsx b/src/features/settings/components/PersonalisationTab.tsx
index 3ce630d1..f30e2564 100644
--- a/src/features/settings/components/PersonalisationTab.tsx
+++ b/src/features/settings/components/PersonalisationTab.tsx
@@ -4,7 +4,7 @@ import { useArtistLayoutStore } from '@/features/artist';
 import { useAuthStore } from '@/store/authStore';
 import type { QueueDisplayMode } from '@/store/authStoreTypes';
 import { useHomeStore } from '@/features/home';
-import { usePlayerBarLayoutStore } from '@/store/playerBarLayoutStore';
+import { usePlayerBarLayoutStore } from '@/features/playback/store/playerBarLayoutStore';
 import { usePlaylistLayoutStore } from '@/features/playlist';
 import { useQueueToolbarStore } from '@/store/queueToolbarStore';
 import { useSidebarStore } from '@/features/sidebar';
diff --git a/src/features/settings/components/PlayerBarLayoutCustomizer.tsx b/src/features/settings/components/PlayerBarLayoutCustomizer.tsx
index 4fce161a..a595f241 100644
--- a/src/features/settings/components/PlayerBarLayoutCustomizer.tsx
+++ b/src/features/settings/components/PlayerBarLayoutCustomizer.tsx
@@ -5,7 +5,7 @@ import LastfmIcon from '@/ui/LastfmIcon';
 import {
   usePlayerBarLayoutStore,
   type PlayerBarLayoutItemId,
-} from '@/store/playerBarLayoutStore';
+} from '@/features/playback/store/playerBarLayoutStore';
 
 const PLAYER_BAR_LAYOUT_LABEL_KEYS: Record<PlayerBarLayoutItemId, string> = {
   starRating: 'settings.playerBarStarRating',