diff --git a/staged/src/App.svelte b/staged/src/App.svelte
index 86f5c475..23beec74 100644
--- a/staged/src/App.svelte
+++ b/staged/src/App.svelte
@@ -8,12 +8,12 @@
   import { onMount, onDestroy } from 'svelte';
   import { getCurrentWindow } from '@tauri-apps/api/window';
   import TopBar from './lib/TopBar.svelte';
-  import ProjectHome from './lib/ProjectHome.svelte';
-  import SessionLauncher from './lib/SessionLauncher.svelte';
-  import AgentSetupModal from './lib/AgentSetupModal.svelte';
-  import { preferences, initPreferences } from './lib/stores/preferences.svelte';
-  import { agentState, refreshProviders } from './lib/stores/agent.svelte';
-  import { refreshSqAvailability } from './lib/stores/sq.svelte';
+  import ProjectHome from './lib/features/projects/ProjectHome.svelte';
+  import SessionLauncher from './lib/features/sessions/SessionLauncher.svelte';
+  import AgentSetupModal from './lib/features/agents/AgentSetupModal.svelte';
+  import { preferences, initPreferences } from './lib/features/settings/preferences.svelte';
+  import { agentState, refreshProviders } from './lib/features/agents/agent.svelte';
+  import { refreshSqAvailability } from './lib/features/settings/sq.svelte';
 
   let showSessionLab = $state(false);
   let showAgentSetup = $state(false);
diff --git a/staged/src/lib/TopBar.svelte b/staged/src/lib/TopBar.svelte
index a00aaf7c..e4c825d9 100644
--- a/staged/src/lib/TopBar.svelte
+++ b/staged/src/lib/TopBar.svelte
@@ -7,8 +7,8 @@
 <script lang="ts">
   import { Palette, Plus, Bot } from 'lucide-svelte';
   import { getCurrentWindow } from '@tauri-apps/api/window';
-  import ThemeSelectorModal from './ThemeSelectorModal.svelte';
-  import AgentDropdown from './AgentDropdown.svelte';
+  import ThemeSelectorModal from './features/settings/ThemeSelectorModal.svelte';
+  import AgentDropdown from './features/agents/AgentDropdown.svelte';
 
   let showThemeModal = $state(false);
   let showAgentDropdown = $state(false);
diff --git a/staged/src/lib/ActionOutputModal.svelte b/staged/src/lib/features/actions/ActionOutputModal.svelte
similarity index 98%
rename from staged/src/lib/ActionOutputModal.svelte
rename to staged/src/lib/features/actions/ActionOutputModal.svelte
index 92944c9d..15e5f1ed 100644
--- a/staged/src/lib/ActionOutputModal.svelte
+++ b/staged/src/lib/features/actions/ActionOutputModal.svelte
@@ -21,22 +21,17 @@
 <script lang="ts">
   import { onMount, onDestroy, tick } from 'svelte';
   import { X, AlertCircle, CircleStop, CheckCircle, XCircle } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import Convert from 'ansi-to-html';
-  import { sanitize } from './sanitize';
-  import type {
-    ActionStatusEvent,
-    ActionOutputEvent,
-    OutputChunk,
-    ActionStatus,
-  } from './services/actions';
+  import { sanitize } from '../../shared/sanitize';
+  import type { ActionStatusEvent, ActionOutputEvent, OutputChunk, ActionStatus } from './actions';
   import {
     getActionOutputBuffer,
     stopBranchAction,
     clearActionExecution,
     listenToActionOutput,
     listenToActionStatus,
-  } from './services/actions';
+  } from './actions';
 
   interface Props {
     executionId: string;
diff --git a/staged/src/lib/services/actions.ts b/staged/src/lib/features/actions/actions.ts
similarity index 100%
rename from staged/src/lib/services/actions.ts
rename to staged/src/lib/features/actions/actions.ts
diff --git a/staged/src/lib/AgentDropdown.svelte b/staged/src/lib/features/agents/AgentDropdown.svelte
similarity index 96%
rename from staged/src/lib/AgentDropdown.svelte
rename to staged/src/lib/features/agents/AgentDropdown.svelte
index a408c86c..78330a9c 100644
--- a/staged/src/lib/AgentDropdown.svelte
+++ b/staged/src/lib/features/agents/AgentDropdown.svelte
@@ -7,10 +7,10 @@
 -->
 <script lang="ts">
   import { Check, ExternalLink, RefreshCw } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
-  import { agentState, refreshProviders, KNOWN_AGENTS } from './stores/agent.svelte';
-  import { setAiAgent, getPreferredAgent } from './stores/preferences.svelte';
-  import { openUrl } from './commands';
+  import Spinner from '../../shared/Spinner.svelte';
+  import { agentState, refreshProviders, KNOWN_AGENTS } from './agent.svelte';
+  import { setAiAgent, getPreferredAgent } from '../settings/preferences.svelte';
+  import { openUrl } from '../../commands';
 
   interface Props {
     onClose: () => void;
diff --git a/staged/src/lib/AgentSelector.svelte b/staged/src/lib/features/agents/AgentSelector.svelte
similarity index 96%
rename from staged/src/lib/AgentSelector.svelte
rename to staged/src/lib/features/agents/AgentSelector.svelte
index 8bae0226..29b41e5a 100644
--- a/staged/src/lib/AgentSelector.svelte
+++ b/staged/src/lib/features/agents/AgentSelector.svelte
@@ -13,8 +13,8 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte';
   import { ChevronDown, Check, Bot } from 'lucide-svelte';
-  import { agentState, REMOTE_AGENTS } from './stores/agent.svelte';
-  import { setAiAgent, getPreferredAgent } from './stores/preferences.svelte';
+  import { agentState, REMOTE_AGENTS } from './agent.svelte';
+  import { setAiAgent, getPreferredAgent } from '../settings/preferences.svelte';
 
   interface Props {
     disabled?: boolean;
diff --git a/staged/src/lib/AgentSetupModal.svelte b/staged/src/lib/features/agents/AgentSetupModal.svelte
similarity index 98%
rename from staged/src/lib/AgentSetupModal.svelte
rename to staged/src/lib/features/agents/AgentSetupModal.svelte
index 37a08dcd..b9eb8757 100644
--- a/staged/src/lib/AgentSetupModal.svelte
+++ b/staged/src/lib/features/agents/AgentSetupModal.svelte
@@ -10,9 +10,9 @@
 -->
 <script lang="ts">
   import { RefreshCw, ExternalLink, Bot, X } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
-  import { agentState, refreshProviders, KNOWN_AGENTS } from './stores/agent.svelte';
-  import { openUrl } from './commands';
+  import Spinner from '../../shared/Spinner.svelte';
+  import { agentState, refreshProviders, KNOWN_AGENTS } from './agent.svelte';
+  import { openUrl } from '../../commands';
 
   interface Props {
     onClose: () => void;
diff --git a/staged/src/lib/stores/agent.svelte.ts b/staged/src/lib/features/agents/agent.svelte.ts
similarity index 97%
rename from staged/src/lib/stores/agent.svelte.ts
rename to staged/src/lib/features/agents/agent.svelte.ts
index 153f2408..0524b7c5 100644
--- a/staged/src/lib/stores/agent.svelte.ts
+++ b/staged/src/lib/features/agents/agent.svelte.ts
@@ -11,7 +11,7 @@
  * the registry of supported agent IDs and CLI commands.
  */
 
-import { discoverAcpProviders, type AcpProviderInfo } from '../commands';
+import { discoverAcpProviders, type AcpProviderInfo } from '../../commands';
 
 // =============================================================================
 // Known agent metadata (display-only — the backend owns the real registry)
diff --git a/staged/src/lib/BranchCard.svelte b/staged/src/lib/features/branches/BranchCard.svelte
similarity index 97%
rename from staged/src/lib/BranchCard.svelte
rename to staged/src/lib/features/branches/BranchCard.svelte
index 3f9343d0..9a967b1d 100644
--- a/staged/src/lib/BranchCard.svelte
+++ b/staged/src/lib/features/branches/BranchCard.svelte
@@ -36,27 +36,26 @@
     MoreVertical,
     ExternalLink,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import { listen, type UnlistenFn } from '@tauri-apps/api/event';
-  import type { Branch, BranchTimeline as BranchTimelineData, BranchSessionType } from './types';
-  import * as commands from './commands';
-  import type { ProjectAction } from './commands';
-  import BranchTimeline from './BranchTimeline.svelte';
-  import DiffModal from './DiffModal.svelte';
-  import SessionModal from './SessionModal.svelte';
-  import NewSessionModal from './NewSessionModal.svelte';
-  import NoteModal from './NoteModal.svelte';
-  import ConfirmDialog from './ConfirmDialog.svelte';
-  import ActionOutputModal from './ActionOutputModal.svelte';
-  import { runBranchAction, type ActionStatusEvent } from './services/actions';
-  import {
-    getAvailableOpeners,
-    openInApp,
-    copyPathToClipboard,
-    type OpenerApp,
-  } from './services/branch';
-  import { getPreferredAgent } from './stores/preferences.svelte';
-  import { agentState, REMOTE_AGENTS } from './stores/agent.svelte';
+  import type {
+    Branch,
+    BranchTimeline as BranchTimelineData,
+    BranchSessionType,
+  } from '../../types';
+  import * as commands from '../../commands';
+  import type { ProjectAction } from '../../commands';
+  import BranchTimeline from '../timeline/BranchTimeline.svelte';
+  import DiffModal from '../diff/DiffModal.svelte';
+  import SessionModal from '../sessions/SessionModal.svelte';
+  import NewSessionModal from '../sessions/NewSessionModal.svelte';
+  import NoteModal from '../notes/NoteModal.svelte';
+  import ConfirmDialog from '../../shared/ConfirmDialog.svelte';
+  import ActionOutputModal from '../actions/ActionOutputModal.svelte';
+  import { runBranchAction, type ActionStatusEvent } from '../actions/actions';
+  import { getAvailableOpeners, openInApp, copyPathToClipboard, type OpenerApp } from './branch';
+  import { getPreferredAgent } from '../settings/preferences.svelte';
+  import { agentState, REMOTE_AGENTS } from '../agents/agent.svelte';
 
   interface Props {
     branch: Branch;
diff --git a/staged/src/lib/NewBranchModal.svelte b/staged/src/lib/features/branches/NewBranchModal.svelte
similarity index 99%
rename from staged/src/lib/NewBranchModal.svelte
rename to staged/src/lib/features/branches/NewBranchModal.svelte
index 80f4b6a2..98be77d8 100644
--- a/staged/src/lib/NewBranchModal.svelte
+++ b/staged/src/lib/features/branches/NewBranchModal.svelte
@@ -22,10 +22,10 @@
     GitPullRequest,
     CircleDot,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
-  import type { Branch, BranchRef, Project, BranchType, PullRequest, Issue } from './types';
-  import * as commands from './commands';
-  import { sqState } from './stores/sq.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
+  import type { Branch, BranchRef, Project, BranchType, PullRequest, Issue } from '../../types';
+  import * as commands from '../../commands';
+  import { sqState } from '../settings/sq.svelte';
 
   interface Props {
     project: Project;
diff --git a/staged/src/lib/RemoteBranchCard.svelte b/staged/src/lib/features/branches/RemoteBranchCard.svelte
similarity index 97%
rename from staged/src/lib/RemoteBranchCard.svelte
rename to staged/src/lib/features/branches/RemoteBranchCard.svelte
index ab7770ea..f77a2a64 100644
--- a/staged/src/lib/RemoteBranchCard.svelte
+++ b/staged/src/lib/features/branches/RemoteBranchCard.svelte
@@ -23,20 +23,20 @@
     StickyNote,
   } from 'lucide-svelte';
   import { listen, type UnlistenFn } from '@tauri-apps/api/event';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import type {
     Branch,
     BranchTimeline as BranchTimelineData,
     BranchSessionType,
     WorkspaceStatus,
-  } from './types';
-  import * as commands from './commands';
-  import BranchTimeline from './BranchTimeline.svelte';
-  import DropdownMenu, { type MenuItem } from './DropdownMenu.svelte';
-  import SessionModal from './SessionModal.svelte';
-  import NewSessionModal from './NewSessionModal.svelte';
-  import NoteModal from './NoteModal.svelte';
-  import ConfirmDialog from './ConfirmDialog.svelte';
+  } from '../../types';
+  import * as commands from '../../commands';
+  import BranchTimeline from '../timeline/BranchTimeline.svelte';
+  import DropdownMenu, { type MenuItem } from '../../shared/DropdownMenu.svelte';
+  import SessionModal from '../sessions/SessionModal.svelte';
+  import NewSessionModal from '../sessions/NewSessionModal.svelte';
+  import NoteModal from '../notes/NoteModal.svelte';
+  import ConfirmDialog from '../../shared/ConfirmDialog.svelte';
 
   interface Props {
     branch: Branch;
diff --git a/staged/src/lib/services/branch.ts b/staged/src/lib/features/branches/branch.ts
similarity index 100%
rename from staged/src/lib/services/branch.ts
rename to staged/src/lib/features/branches/branch.ts
diff --git a/staged/src/lib/AnnotationOverlay.svelte b/staged/src/lib/features/diff/AnnotationOverlay.svelte
similarity index 97%
rename from staged/src/lib/AnnotationOverlay.svelte
rename to staged/src/lib/features/diff/AnnotationOverlay.svelte
index de200db6..693ab3a7 100644
--- a/staged/src/lib/AnnotationOverlay.svelte
+++ b/staged/src/lib/features/diff/AnnotationOverlay.svelte
@@ -6,7 +6,7 @@
   by holding down the 'A' key.
 -->
 <script lang="ts">
-  import type { SmartDiffAnnotation } from './types';
+  import type { SmartDiffAnnotation } from '../../types';
 
   interface Props {
     annotation: SmartDiffAnnotation;
diff --git a/staged/src/lib/BeforeAnnotationOverlay.svelte b/staged/src/lib/features/diff/BeforeAnnotationOverlay.svelte
similarity index 97%
rename from staged/src/lib/BeforeAnnotationOverlay.svelte
rename to staged/src/lib/features/diff/BeforeAnnotationOverlay.svelte
index e266d414..a19df765 100644
--- a/staged/src/lib/BeforeAnnotationOverlay.svelte
+++ b/staged/src/lib/features/diff/BeforeAnnotationOverlay.svelte
@@ -5,7 +5,7 @@
   was doing. Uses the before_description field from annotations.
 -->
 <script lang="ts">
-  import type { SmartDiffAnnotation } from './types';
+  import type { SmartDiffAnnotation } from '../../types';
 
   interface Props {
     annotation: SmartDiffAnnotation;
diff --git a/staged/src/lib/CommentEditor.svelte b/staged/src/lib/features/diff/CommentEditor.svelte
similarity index 98%
rename from staged/src/lib/CommentEditor.svelte
rename to staged/src/lib/features/diff/CommentEditor.svelte
index 51c81a4d..2b207ed3 100644
--- a/staged/src/lib/CommentEditor.svelte
+++ b/staged/src/lib/features/diff/CommentEditor.svelte
@@ -6,7 +6,7 @@
 -->
 <script lang="ts">
   import { Trash2 } from 'lucide-svelte';
-  import type { Comment } from './types';
+  import type { Comment } from '../../types';
 
   interface Props {
     /** Position relative to the viewer container */
diff --git a/staged/src/lib/DiffModal.svelte b/staged/src/lib/features/diff/DiffModal.svelte
similarity index 99%
rename from staged/src/lib/DiffModal.svelte
rename to staged/src/lib/features/diff/DiffModal.svelte
index 2c0c0e92..ef912406 100644
--- a/staged/src/lib/DiffModal.svelte
+++ b/staged/src/lib/features/diff/DiffModal.svelte
@@ -28,11 +28,11 @@
     CircleMinus,
     CircleArrowUp,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import DiffViewer from './DiffViewer.svelte';
-  import { createDiffViewerState, fileSummaryPath } from './stores/diffViewerState.svelte';
-  import { createReviewState } from './stores/reviewState.svelte';
-  import type { Span, FileDiffSummary, Comment } from './types';
+  import { createDiffViewerState, fileSummaryPath } from './diffViewerState.svelte';
+  import { createReviewState } from './reviewState.svelte';
+  import type { Span, FileDiffSummary, Comment } from '../../types';
 
   // ==========================================================================
   // Props
diff --git a/staged/src/lib/DiffViewer.svelte b/staged/src/lib/features/diff/DiffViewer.svelte
similarity index 99%
rename from staged/src/lib/DiffViewer.svelte
rename to staged/src/lib/features/diff/DiffViewer.svelte
index 34671dce..ddaa1a8f 100644
--- a/staged/src/lib/DiffViewer.svelte
+++ b/staged/src/lib/features/diff/DiffViewer.svelte
@@ -18,21 +18,18 @@
   import { onMount } from 'svelte';
   import { MessageSquarePlus, MessageSquare, X, FileText, Code } from 'lucide-svelte';
   import { marked } from 'marked';
-  import { sanitize } from './sanitize';
-  import type { FileDiff, Alignment, Comment, Span, SmartDiffAnnotation } from './types';
+  import { sanitize } from '../../shared/sanitize';
+  import type { FileDiff, Alignment, Comment, Span, SmartDiffAnnotation } from '../../types';
   import {
     initHighlighter,
     highlightLines,
     detectLanguage,
     prepareLanguage,
     type Token,
-  } from './services/highlighter';
-  import { createScrollController } from './services/scrollController.svelte';
-  import { setupMarkdownScrollSync } from './services/markdownScrollSync';
-  import {
-    ConnectorRendererCanvas,
-    type CommentHighlightInfo,
-  } from './services/connectorRendererCanvas';
+  } from './highlighter';
+  import { createScrollController } from './scrollController.svelte';
+  import { setupMarkdownScrollSync } from './markdownScrollSync';
+  import { ConnectorRendererCanvas, type CommentHighlightInfo } from './connectorRendererCanvas';
   import {
     getLineBoundary,
     getLanguageFromDiff,
@@ -44,8 +41,8 @@
   import CommentEditor from './CommentEditor.svelte';
   import AnnotationOverlay from './AnnotationOverlay.svelte';
   import BeforeAnnotationOverlay from './BeforeAnnotationOverlay.svelte';
-  import Scrollbar from './Scrollbar.svelte';
-  import HorizontalScrollbar from './HorizontalScrollbar.svelte';
+  import Scrollbar from '../../shared/Scrollbar.svelte';
+  import HorizontalScrollbar from '../../shared/HorizontalScrollbar.svelte';
 
   // ==========================================================================
   // Props
diff --git a/staged/src/lib/services/connectorRendererCanvas.ts b/staged/src/lib/features/diff/connectorRendererCanvas.ts
similarity index 99%
rename from staged/src/lib/services/connectorRendererCanvas.ts
rename to staged/src/lib/features/diff/connectorRendererCanvas.ts
index 2e0b8a69..d8c05f38 100644
--- a/staged/src/lib/services/connectorRendererCanvas.ts
+++ b/staged/src/lib/features/diff/connectorRendererCanvas.ts
@@ -17,7 +17,7 @@
  * - Comment highlights rendered as simple rects
  */
 
-import type { Alignment, Span, Comment } from '../types';
+import type { Alignment, Span, Comment } from '../../types';
 
 // ============================================================================
 // Types
diff --git a/staged/src/lib/diffKeyboard.ts b/staged/src/lib/features/diff/diffKeyboard.ts
similarity index 99%
rename from staged/src/lib/diffKeyboard.ts
rename to staged/src/lib/features/diff/diffKeyboard.ts
index ce28355b..3cb3a645 100644
--- a/staged/src/lib/diffKeyboard.ts
+++ b/staged/src/lib/features/diff/diffKeyboard.ts
@@ -11,7 +11,7 @@
  * Uses plain DOM event listeners (no external keyboard service dependency).
  */
 
-import type { Alignment } from './types';
+import type { Alignment } from '../../types';
 
 export interface DiffNavConfig {
   scrollAmount: number; // pixels per keypress for smooth scroll
diff --git a/staged/src/lib/diffUtils.ts b/staged/src/lib/features/diff/diffUtils.ts
similarity index 98%
rename from staged/src/lib/diffUtils.ts
rename to staged/src/lib/features/diff/diffUtils.ts
index cba5ea87..838f0ad9 100644
--- a/staged/src/lib/diffUtils.ts
+++ b/staged/src/lib/features/diff/diffUtils.ts
@@ -4,7 +4,7 @@
  * Pure helper functions for diff display.
  */
 
-import type { FileDiff, Alignment, FileContent } from './types';
+import type { FileDiff, Alignment, FileContent } from '../../types';
 
 /**
  * Get display path from a FileDiff, handling renames.
diff --git a/staged/src/lib/stores/diffViewerState.svelte.ts b/staged/src/lib/features/diff/diffViewerState.svelte.ts
similarity index 97%
rename from staged/src/lib/stores/diffViewerState.svelte.ts
rename to staged/src/lib/features/diff/diffViewerState.svelte.ts
index 35afdc72..3c31158b 100644
--- a/staged/src/lib/stores/diffViewerState.svelte.ts
+++ b/staged/src/lib/features/diff/diffViewerState.svelte.ts
@@ -12,8 +12,8 @@
  * This is a factory — each DiffModal creates its own instance.
  */
 
-import * as commands from '../commands';
-import type { FileDiffSummary, FileDiff } from '../types';
+import * as commands from '../../commands';
+import type { FileDiffSummary, FileDiff } from '../../types';
 
 // =============================================================================
 // Type
diff --git a/staged/src/lib/services/highlighter.ts b/staged/src/lib/features/diff/highlighter.ts
similarity index 99%
rename from staged/src/lib/services/highlighter.ts
rename to staged/src/lib/features/diff/highlighter.ts
index 2bf8026f..127b8ce0 100644
--- a/staged/src/lib/services/highlighter.ts
+++ b/staged/src/lib/features/diff/highlighter.ts
@@ -12,7 +12,7 @@
  */
 
 import { createHighlighter, type Highlighter, type ThemedToken, type BundledLanguage } from 'shiki';
-import { luminance } from '../theme';
+import { luminance } from '../../theme';
 
 // Simple token type that doesn't leak Shiki internals
 export interface Token {
diff --git a/staged/src/lib/services/markdownScrollSync.ts b/staged/src/lib/features/diff/markdownScrollSync.ts
similarity index 100%
rename from staged/src/lib/services/markdownScrollSync.ts
rename to staged/src/lib/features/diff/markdownScrollSync.ts
diff --git a/staged/src/lib/stores/reviewState.svelte.ts b/staged/src/lib/features/diff/reviewState.svelte.ts
similarity index 98%
rename from staged/src/lib/stores/reviewState.svelte.ts
rename to staged/src/lib/features/diff/reviewState.svelte.ts
index d42f69f8..6e7fa5e1 100644
--- a/staged/src/lib/stores/reviewState.svelte.ts
+++ b/staged/src/lib/features/diff/reviewState.svelte.ts
@@ -13,8 +13,8 @@
  * This is a factory — each DiffModal creates its own instance.
  */
 
-import * as commands from '../commands';
-import type { Comment, Span, Review, FileContent } from '../types';
+import * as commands from '../../commands';
+import type { Comment, Span, Review, FileContent } from '../../types';
 
 // =============================================================================
 // Type
diff --git a/staged/src/lib/services/scrollController.svelte.ts b/staged/src/lib/features/diff/scrollController.svelte.ts
similarity index 99%
rename from staged/src/lib/services/scrollController.svelte.ts
rename to staged/src/lib/features/diff/scrollController.svelte.ts
index 4932fe65..b8ce893b 100644
--- a/staged/src/lib/services/scrollController.svelte.ts
+++ b/staged/src/lib/features/diff/scrollController.svelte.ts
@@ -12,7 +12,7 @@
  * - Momentum scrolling support
  */
 
-import type { Alignment, Span } from '../types';
+import type { Alignment, Span } from '../../types';
 
 /** Anchor point as fraction of viewport height (1/3 from top keeps context visible) */
 const SCROLL_ANCHOR_FRACTION = 1 / 3;
diff --git a/staged/src/lib/NoteModal.svelte b/staged/src/lib/features/notes/NoteModal.svelte
similarity index 99%
rename from staged/src/lib/NoteModal.svelte
rename to staged/src/lib/features/notes/NoteModal.svelte
index 83436444..ddc0ef9e 100644
--- a/staged/src/lib/NoteModal.svelte
+++ b/staged/src/lib/features/notes/NoteModal.svelte
@@ -7,7 +7,7 @@
 <script lang="ts">
   import { X } from 'lucide-svelte';
   import { marked } from 'marked';
-  import { sanitize } from './sanitize';
+  import { sanitize } from '../../shared/sanitize';
 
   marked.setOptions({ breaks: true, gfm: true });
 
diff --git a/staged/src/lib/FolderPickerModal.svelte b/staged/src/lib/features/projects/FolderPickerModal.svelte
similarity index 99%
rename from staged/src/lib/FolderPickerModal.svelte
rename to staged/src/lib/features/projects/FolderPickerModal.svelte
index 840843af..de16b2ea 100644
--- a/staged/src/lib/FolderPickerModal.svelte
+++ b/staged/src/lib/features/projects/FolderPickerModal.svelte
@@ -10,7 +10,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { Folder, X, ChevronRight, Home, Search, GitBranch } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import {
     listDirectory,
     getHomeDir,
@@ -18,7 +18,7 @@
     findRecentRepos,
     type DirEntry,
     type RecentRepo,
-  } from './services/files';
+  } from '../../shared/files';
 
   interface Props {
     onSelect: (path: string) => void;
diff --git a/staged/src/lib/NewProjectModal.svelte b/staged/src/lib/features/projects/NewProjectModal.svelte
similarity index 98%
rename from staged/src/lib/NewProjectModal.svelte
rename to staged/src/lib/features/projects/NewProjectModal.svelte
index 2aca5c85..491019d4 100644
--- a/staged/src/lib/NewProjectModal.svelte
+++ b/staged/src/lib/features/projects/NewProjectModal.svelte
@@ -7,11 +7,11 @@
 -->
 <script lang="ts">
   import { X, GitBranch, Folder } from 'lucide-svelte';
-  import type { Project } from './types';
-  import * as commands from './commands';
+  import type { Project } from '../../types';
+  import * as commands from '../../commands';
   import FolderPickerModal from './FolderPickerModal.svelte';
-  import { detectProjectActions } from './services/actions';
-  import { listDirectory, type DirEntry } from './services/files';
+  import { detectProjectActions } from '../actions/actions';
+  import { listDirectory, type DirEntry } from '../../shared/files';
 
   interface Props {
     onCreated: (project: Project) => void;
diff --git a/staged/src/lib/ProjectHome.svelte b/staged/src/lib/features/projects/ProjectHome.svelte
similarity index 97%
rename from staged/src/lib/ProjectHome.svelte
rename to staged/src/lib/features/projects/ProjectHome.svelte
index 5c87811b..6b451835 100644
--- a/staged/src/lib/ProjectHome.svelte
+++ b/staged/src/lib/features/projects/ProjectHome.svelte
@@ -7,16 +7,16 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import { getCurrentWindow } from '@tauri-apps/api/window';
-  import type { Project, Branch, StoreIncompatibility } from './types';
-  import * as commands from './commands';
-  import { runPrerunActions } from './services/actions';
-  import { projectDisplayName } from './utils';
+  import type { Project, Branch, StoreIncompatibility } from '../../types';
+  import * as commands from '../../commands';
+  import { runPrerunActions } from '../actions/actions';
+  import { projectDisplayName } from '../../shared/utils';
   import ProjectSection from './ProjectSection.svelte';
   import NewProjectModal from './NewProjectModal.svelte';
-  import NewBranchModal from './NewBranchModal.svelte';
-  import ConfirmDialog from './ConfirmDialog.svelte';
-  import GitTreeAnimation from './GitTreeAnimation.svelte';
-  import StagedIcon from './StagedIcon.svelte';
+  import NewBranchModal from '../branches/NewBranchModal.svelte';
+  import ConfirmDialog from '../../shared/ConfirmDialog.svelte';
+  import GitTreeAnimation from '../../shared/GitTreeAnimation.svelte';
+  import StagedIcon from '../../shared/StagedIcon.svelte';
 
   // Data
   let projects = $state<Project[]>([]);
diff --git a/staged/src/lib/ProjectSection.svelte b/staged/src/lib/features/projects/ProjectSection.svelte
similarity index 93%
rename from staged/src/lib/ProjectSection.svelte
rename to staged/src/lib/features/projects/ProjectSection.svelte
index fe8e09ac..9541e955 100644
--- a/staged/src/lib/ProjectSection.svelte
+++ b/staged/src/lib/features/projects/ProjectSection.svelte
@@ -6,11 +6,11 @@
 -->
 <script lang="ts">
   import { Folder, Trash2, Plus, Settings, Loader2 } from 'lucide-svelte';
-  import type { Project, Branch } from './types';
-  import { projectDisplayName } from './utils';
-  import BranchCard from './BranchCard.svelte';
-  import RemoteBranchCard from './RemoteBranchCard.svelte';
-  import DropdownMenu, { type MenuItem } from './DropdownMenu.svelte';
+  import type { Project, Branch } from '../../types';
+  import { projectDisplayName } from '../../shared/utils';
+  import BranchCard from '../branches/BranchCard.svelte';
+  import RemoteBranchCard from '../branches/RemoteBranchCard.svelte';
+  import DropdownMenu, { type MenuItem } from '../../shared/DropdownMenu.svelte';
   import ProjectSettingsModal from './ProjectSettingsModal.svelte';
 
   interface Props {
diff --git a/staged/src/lib/ProjectSettingsModal.svelte b/staged/src/lib/features/projects/ProjectSettingsModal.svelte
similarity index 98%
rename from staged/src/lib/ProjectSettingsModal.svelte
rename to staged/src/lib/features/projects/ProjectSettingsModal.svelte
index bd912a9e..6389a6ec 100644
--- a/staged/src/lib/ProjectSettingsModal.svelte
+++ b/staged/src/lib/features/projects/ProjectSettingsModal.svelte
@@ -17,12 +17,12 @@
     Pencil,
     Code2,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
-  import type { Project } from './types';
-  import type { ProjectAction } from './commands';
-  import * as commands from './commands';
-  import { detectProjectActions } from './services/actions';
-  import type { SuggestedAction, ActionType } from './services/actions';
+  import Spinner from '../../shared/Spinner.svelte';
+  import type { Project } from '../../types';
+  import type { ProjectAction } from '../../commands';
+  import * as commands from '../../commands';
+  import { detectProjectActions } from '../actions/actions';
+  import type { SuggestedAction, ActionType } from '../actions/actions';
 
   interface Props {
     project: Project;
diff --git a/staged/src/lib/NewSessionModal.svelte b/staged/src/lib/features/sessions/NewSessionModal.svelte
similarity index 96%
rename from staged/src/lib/NewSessionModal.svelte
rename to staged/src/lib/features/sessions/NewSessionModal.svelte
index dfd872dd..7d58d92b 100644
--- a/staged/src/lib/NewSessionModal.svelte
+++ b/staged/src/lib/features/sessions/NewSessionModal.svelte
@@ -15,12 +15,12 @@
 -->
 <script lang="ts">
   import { X, GitCommitHorizontal, FileText, GitBranch, Send } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
-  import type { Branch, BranchSessionType } from './types';
-  import * as commands from './commands';
-  import AgentSelector from './AgentSelector.svelte';
-  import { agentState, REMOTE_AGENTS } from './stores/agent.svelte';
-  import { getPreferredAgent } from './stores/preferences.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
+  import type { Branch, BranchSessionType } from '../../types';
+  import * as commands from '../../commands';
+  import AgentSelector from '../agents/AgentSelector.svelte';
+  import { agentState, REMOTE_AGENTS } from '../agents/agent.svelte';
+  import { getPreferredAgent } from '../settings/preferences.svelte';
 
   interface Props {
     branch: Branch;
diff --git a/staged/src/lib/SessionLauncher.svelte b/staged/src/lib/features/sessions/SessionLauncher.svelte
similarity index 97%
rename from staged/src/lib/SessionLauncher.svelte
rename to staged/src/lib/features/sessions/SessionLauncher.svelte
index 3dd53026..d7410a1a 100644
--- a/staged/src/lib/SessionLauncher.svelte
+++ b/staged/src/lib/features/sessions/SessionLauncher.svelte
@@ -12,12 +12,12 @@
   import { onMount, onDestroy } from 'svelte';
   import { listen, type UnlistenFn } from '@tauri-apps/api/event';
   import { Plus, X, CheckCircle, AlertCircle, Ban, Eye, Trash2 } from 'lucide-svelte';
-  import type { Session, SessionStatus } from './types';
-  import { startSession, deleteSession } from './commands';
+  import type { Session, SessionStatus } from '../../types';
+  import { startSession, deleteSession } from '../../commands';
   import SessionModal from './SessionModal.svelte';
-  import Spinner from './Spinner.svelte';
-  import { agentState } from './stores/agent.svelte';
-  import { getPreferredAgent } from './stores/preferences.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
+  import { agentState } from '../agents/agent.svelte';
+  import { getPreferredAgent } from '../settings/preferences.svelte';
 
   interface Props {
     onClose: () => void;
diff --git a/staged/src/lib/SessionModal.svelte b/staged/src/lib/features/sessions/SessionModal.svelte
similarity index 99%
rename from staged/src/lib/SessionModal.svelte
rename to staged/src/lib/features/sessions/SessionModal.svelte
index 26581965..7807dd56 100644
--- a/staged/src/lib/SessionModal.svelte
+++ b/staged/src/lib/features/sessions/SessionModal.svelte
@@ -38,17 +38,17 @@
     Zap,
     GitBranch,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
   import { marked } from 'marked';
-  import { sanitize } from './sanitize';
-  import type { Session, SessionMessage } from './types';
+  import { sanitize } from '../../shared/sanitize';
+  import type { Session, SessionMessage } from '../../types';
   import {
     cancelSession,
     getSession,
     getSessionMessages,
     getSessionMessagesSince,
     resumeSession,
-  } from './commands';
+  } from '../../commands';
 
   // Configure marked
   marked.setOptions({ breaks: true, gfm: true });
diff --git a/staged/src/lib/ThemeSelectorModal.svelte b/staged/src/lib/features/settings/ThemeSelectorModal.svelte
similarity index 99%
rename from staged/src/lib/ThemeSelectorModal.svelte
rename to staged/src/lib/features/settings/ThemeSelectorModal.svelte
index dbd7209e..881d0191 100644
--- a/staged/src/lib/ThemeSelectorModal.svelte
+++ b/staged/src/lib/features/settings/ThemeSelectorModal.svelte
@@ -12,7 +12,7 @@
     getAvailableSyntaxThemes,
     selectSyntaxTheme,
     isLightTheme,
-  } from './stores/preferences.svelte';
+  } from './preferences.svelte';
 
   interface Props {
     onClose: () => void;
diff --git a/staged/src/lib/stores/preferences.svelte.ts b/staged/src/lib/features/settings/preferences.svelte.ts
similarity index 98%
rename from staged/src/lib/stores/preferences.svelte.ts
rename to staged/src/lib/features/settings/preferences.svelte.ts
index 39a61793..d1b68c25 100644
--- a/staged/src/lib/stores/preferences.svelte.ts
+++ b/staged/src/lib/features/settings/preferences.svelte.ts
@@ -15,9 +15,9 @@ import {
   getTheme,
   isLightTheme,
   type SyntaxThemeName,
-} from '../services/highlighter';
-import { initPersistentStore, getStoreValue, setStoreValue } from '../services/persistentStore';
-import { createAdaptiveTheme, themeToVarMap } from '../theme';
+} from '../diff/highlighter';
+import { initPersistentStore, getStoreValue, setStoreValue } from '../../shared/persistentStore';
+import { createAdaptiveTheme, themeToVarMap } from '../../theme';
 
 // Re-export for convenience
 export { isLightTheme };
diff --git a/staged/src/lib/stores/sq.svelte.ts b/staged/src/lib/features/settings/sq.svelte.ts
similarity index 94%
rename from staged/src/lib/stores/sq.svelte.ts
rename to staged/src/lib/features/settings/sq.svelte.ts
index 8878ee9c..399f1735 100644
--- a/staged/src/lib/stores/sq.svelte.ts
+++ b/staged/src/lib/features/settings/sq.svelte.ts
@@ -6,7 +6,7 @@
  * introducing a per-open delay.
  */
 
-import { isSqAvailable } from '../commands';
+import { isSqAvailable } from '../../commands';
 
 /** Shared reactive state for sq CLI availability. */
 export const sqState = $state({
diff --git a/staged/src/lib/BranchTimeline.svelte b/staged/src/lib/features/timeline/BranchTimeline.svelte
similarity index 99%
rename from staged/src/lib/BranchTimeline.svelte
rename to staged/src/lib/features/timeline/BranchTimeline.svelte
index 198568fd..89d138f6 100644
--- a/staged/src/lib/BranchTimeline.svelte
+++ b/staged/src/lib/features/timeline/BranchTimeline.svelte
@@ -6,7 +6,7 @@
   Pending items (running sessions, generating notes) appear at the bottom.
 -->
 <script lang="ts">
-  import type { BranchTimeline as BranchTimelineData } from './types';
+  import type { BranchTimeline as BranchTimelineData } from '../../types';
   import TimelineRow from './TimelineRow.svelte';
   import type { TimelineItemType } from './TimelineRow.svelte';
 
diff --git a/staged/src/lib/TimelineRow.svelte b/staged/src/lib/features/timeline/TimelineRow.svelte
similarity index 99%
rename from staged/src/lib/TimelineRow.svelte
rename to staged/src/lib/features/timeline/TimelineRow.svelte
index 81a8eb53..2d8797de 100644
--- a/staged/src/lib/TimelineRow.svelte
+++ b/staged/src/lib/features/timeline/TimelineRow.svelte
@@ -14,7 +14,7 @@
     Trash2,
     AlertTriangle,
   } from 'lucide-svelte';
-  import Spinner from './Spinner.svelte';
+  import Spinner from '../../shared/Spinner.svelte';
 
   export type TimelineItemType =
     | 'commit'
diff --git a/staged/src/lib/ConfirmDialog.svelte b/staged/src/lib/shared/ConfirmDialog.svelte
similarity index 100%
rename from staged/src/lib/ConfirmDialog.svelte
rename to staged/src/lib/shared/ConfirmDialog.svelte
diff --git a/staged/src/lib/DropdownMenu.svelte b/staged/src/lib/shared/DropdownMenu.svelte
similarity index 100%
rename from staged/src/lib/DropdownMenu.svelte
rename to staged/src/lib/shared/DropdownMenu.svelte
diff --git a/staged/src/lib/GitTreeAnimation.svelte b/staged/src/lib/shared/GitTreeAnimation.svelte
similarity index 100%
rename from staged/src/lib/GitTreeAnimation.svelte
rename to staged/src/lib/shared/GitTreeAnimation.svelte
diff --git a/staged/src/lib/HorizontalScrollbar.svelte b/staged/src/lib/shared/HorizontalScrollbar.svelte
similarity index 100%
rename from staged/src/lib/HorizontalScrollbar.svelte
rename to staged/src/lib/shared/HorizontalScrollbar.svelte
diff --git a/staged/src/lib/Scrollbar.svelte b/staged/src/lib/shared/Scrollbar.svelte
similarity index 100%
rename from staged/src/lib/Scrollbar.svelte
rename to staged/src/lib/shared/Scrollbar.svelte
diff --git a/staged/src/lib/Spinner.svelte b/staged/src/lib/shared/Spinner.svelte
similarity index 100%
rename from staged/src/lib/Spinner.svelte
rename to staged/src/lib/shared/Spinner.svelte
diff --git a/staged/src/lib/StagedIcon.svelte b/staged/src/lib/shared/StagedIcon.svelte
similarity index 100%
rename from staged/src/lib/StagedIcon.svelte
rename to staged/src/lib/shared/StagedIcon.svelte
diff --git a/staged/src/lib/services/files.ts b/staged/src/lib/shared/files.ts
similarity index 100%
rename from staged/src/lib/services/files.ts
rename to staged/src/lib/shared/files.ts
diff --git a/staged/src/lib/services/persistentStore.ts b/staged/src/lib/shared/persistentStore.ts
similarity index 100%
rename from staged/src/lib/services/persistentStore.ts
rename to staged/src/lib/shared/persistentStore.ts
diff --git a/staged/src/lib/sanitize.ts b/staged/src/lib/shared/sanitize.ts
similarity index 100%
rename from staged/src/lib/sanitize.ts
rename to staged/src/lib/shared/sanitize.ts
diff --git a/staged/src/lib/utils.ts b/staged/src/lib/shared/utils.ts
similarity index 87%
rename from staged/src/lib/utils.ts
rename to staged/src/lib/shared/utils.ts
index 7e6117be..cbdf414c 100644
--- a/staged/src/lib/utils.ts
+++ b/staged/src/lib/shared/utils.ts
@@ -2,7 +2,7 @@
  * Shared utility functions.
  */
 
-import type { Project } from './types';
+import type { Project } from '../types';
 
 /** Display name for a project: repo basename + optional subpath. */
 export function projectDisplayName(p: Project): string {