diff --git a/frontend/src/lib/document/DocumentRow.svelte b/frontend/src/lib/document/DocumentRow.svelte
index 5c1763fd..70c85ed3 100644
--- a/frontend/src/lib/document/DocumentRow.svelte
+++ b/frontend/src/lib/document/DocumentRow.svelte
@@ -5,8 +5,8 @@ import { applyOffsets } from '$lib/document/search';
 import { formatDate } from '$lib/shared/utils/date';
 import * as m from '$lib/paraglide/messages.js';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
-import ProgressRing from '$lib/components/ProgressRing.svelte';
-import ContributorStack from '$lib/components/ContributorStack.svelte';
+import ProgressRing from '$lib/shared/primitives/ProgressRing.svelte';
+import ContributorStack from '$lib/shared/primitives/ContributorStack.svelte';
 import DocumentThumbnail from './DocumentThumbnail.svelte';
 
 type DocumentSearchItem = components['schemas']['DocumentSearchItem'];
diff --git a/frontend/src/lib/document/DocumentTopBar.svelte b/frontend/src/lib/document/DocumentTopBar.svelte
index 023cf82f..96381a69 100644
--- a/frontend/src/lib/document/DocumentTopBar.svelte
+++ b/frontend/src/lib/document/DocumentTopBar.svelte
@@ -4,9 +4,9 @@ import { slide } from 'svelte/transition';
 import { formatDate } from '$lib/shared/utils/date';
 import { clickOutside } from '$lib/shared/actions/clickOutside';
 import PersonChipRow from '$lib/person/PersonChipRow.svelte';
-import OverflowPillButton from '$lib/components/OverflowPillButton.svelte';
+import OverflowPillButton from '$lib/shared/primitives/OverflowPillButton.svelte';
 import DocumentMetadataDrawer from './DocumentMetadataDrawer.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 type Tag = { id: string; name: string };
diff --git a/frontend/src/lib/document/ReadyColumn.svelte b/frontend/src/lib/document/ReadyColumn.svelte
index 3f8ce38b..ec38419a 100644
--- a/frontend/src/lib/document/ReadyColumn.svelte
+++ b/frontend/src/lib/document/ReadyColumn.svelte
@@ -3,7 +3,7 @@ import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
 import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from '$lib/components/ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/document/SegmentationColumn.svelte b/frontend/src/lib/document/SegmentationColumn.svelte
index 9de941f3..2d25cb2d 100644
--- a/frontend/src/lib/document/SegmentationColumn.svelte
+++ b/frontend/src/lib/document/SegmentationColumn.svelte
@@ -3,7 +3,7 @@ import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
 import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from '$lib/components/ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
index a55c0d5c..6a5ead9d 100644
--- a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
-import CommentThread from '$lib/components/CommentThread.svelte';
-import PersonMentionEditor from '$lib/components/PersonMentionEditor.svelte';
+import CommentThread from '$lib/shared/discussion/CommentThread.svelte';
+import PersonMentionEditor from '$lib/shared/discussion/PersonMentionEditor.svelte';
 import type { PersonMention } from '$lib/types';
 
 const { confirm } = getConfirmService();
diff --git a/frontend/src/lib/document/transcription/TranscriptionColumn.svelte b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
index 5f448586..feef8a28 100644
--- a/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
@@ -3,7 +3,7 @@ import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
 import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from '$lib/components/ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionEditView.svelte b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
index c8ddcee4..258fc1dd 100644
--- a/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
@@ -2,7 +2,7 @@
 import { m } from '$lib/paraglide/messages.js';
 import TranscriptionBlock from './TranscriptionBlock.svelte';
 import OcrTrigger from '$lib/ocr/OcrTrigger.svelte';
-import TranscribeCoachEmptyState from '$lib/components/TranscribeCoachEmptyState.svelte';
+import TranscribeCoachEmptyState from '$lib/shared/help/TranscribeCoachEmptyState.svelte';
 import type { PersonMention, TranscriptionBlockData } from '$lib/types';
 import { createBlockAutoSave } from '$lib/document/transcription/useBlockAutoSave.svelte';
 import { createBlockDragDrop } from '$lib/document/transcription/useBlockDragDrop.svelte';
diff --git a/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
index 95c4b576..649d799a 100644
--- a/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
-import HelpPopover from '$lib/components/HelpPopover.svelte';
+import HelpPopover from '$lib/shared/help/HelpPopover.svelte';
 
 type Props = {
 	mode: 'read' | 'edit';
diff --git a/frontend/src/lib/person/PersonChipRow.svelte b/frontend/src/lib/person/PersonChipRow.svelte
index 2f29ae2f..1deeee59 100644
--- a/frontend/src/lib/person/PersonChipRow.svelte
+++ b/frontend/src/lib/person/PersonChipRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import PersonChip from './PersonChip.svelte';
-import OverflowPillDisplay from '$lib/components/OverflowPillDisplay.svelte';
+import OverflowPillDisplay from '$lib/shared/primitives/OverflowPillDisplay.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 
diff --git a/frontend/src/lib/components/DashboardFamilyPulse.svelte b/frontend/src/lib/shared/dashboard/DashboardFamilyPulse.svelte
similarity index 100%
rename from frontend/src/lib/components/DashboardFamilyPulse.svelte
rename to frontend/src/lib/shared/dashboard/DashboardFamilyPulse.svelte
diff --git a/frontend/src/lib/components/DashboardRecentDocuments.svelte b/frontend/src/lib/shared/dashboard/DashboardRecentDocuments.svelte
similarity index 100%
rename from frontend/src/lib/components/DashboardRecentDocuments.svelte
rename to frontend/src/lib/shared/dashboard/DashboardRecentDocuments.svelte
diff --git a/frontend/src/lib/components/DashboardRecentDocuments.svelte.spec.ts b/frontend/src/lib/shared/dashboard/DashboardRecentDocuments.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DashboardRecentDocuments.svelte.spec.ts
rename to frontend/src/lib/shared/dashboard/DashboardRecentDocuments.svelte.spec.ts
diff --git a/frontend/src/lib/components/DashboardResumeStrip.svelte b/frontend/src/lib/shared/dashboard/DashboardResumeStrip.svelte
similarity index 100%
rename from frontend/src/lib/components/DashboardResumeStrip.svelte
rename to frontend/src/lib/shared/dashboard/DashboardResumeStrip.svelte
diff --git a/frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts b/frontend/src/lib/shared/dashboard/DashboardResumeStrip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DashboardResumeStrip.svelte.spec.ts
rename to frontend/src/lib/shared/dashboard/DashboardResumeStrip.svelte.spec.ts
diff --git a/frontend/src/lib/components/MissionControlStrip.svelte b/frontend/src/lib/shared/dashboard/MissionControlStrip.svelte
similarity index 100%
rename from frontend/src/lib/components/MissionControlStrip.svelte
rename to frontend/src/lib/shared/dashboard/MissionControlStrip.svelte
diff --git a/frontend/src/lib/components/MissionControlStrip.svelte.spec.ts b/frontend/src/lib/shared/dashboard/MissionControlStrip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/MissionControlStrip.svelte.spec.ts
rename to frontend/src/lib/shared/dashboard/MissionControlStrip.svelte.spec.ts
diff --git a/frontend/src/lib/components/CommentMessage.svelte b/frontend/src/lib/shared/discussion/CommentMessage.svelte
similarity index 100%
rename from frontend/src/lib/components/CommentMessage.svelte
rename to frontend/src/lib/shared/discussion/CommentMessage.svelte
diff --git a/frontend/src/lib/components/CommentMessage.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/CommentMessage.svelte.spec.ts
rename to frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
diff --git a/frontend/src/lib/components/CommentThread.svelte b/frontend/src/lib/shared/discussion/CommentThread.svelte
similarity index 97%
rename from frontend/src/lib/components/CommentThread.svelte
rename to frontend/src/lib/shared/discussion/CommentThread.svelte
index c8b045b6..a7182b01 100644
--- a/frontend/src/lib/components/CommentThread.svelte
+++ b/frontend/src/lib/shared/discussion/CommentThread.svelte
@@ -2,8 +2,8 @@
 import { onMount, untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import type { Comment, FlatMessage, MentionDTO } from '$lib/types';
-import MentionEditor from '$lib/components/MentionEditor.svelte';
-import CommentMessage from '$lib/components/CommentMessage.svelte';
+import MentionEditor from '$lib/shared/discussion/MentionEditor.svelte';
+import CommentMessage from '$lib/shared/discussion/CommentMessage.svelte';
 import { extractContent } from '$lib/shared/discussion/mention';
 type Props = {
 	documentId: string;
diff --git a/frontend/src/lib/components/CommentThread.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/CommentThread.svelte.spec.ts
rename to frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
diff --git a/frontend/src/lib/components/MentionDropdown.svelte b/frontend/src/lib/shared/discussion/MentionDropdown.svelte
similarity index 100%
rename from frontend/src/lib/components/MentionDropdown.svelte
rename to frontend/src/lib/shared/discussion/MentionDropdown.svelte
diff --git a/frontend/src/lib/components/MentionEditor.svelte b/frontend/src/lib/shared/discussion/MentionEditor.svelte
similarity index 100%
rename from frontend/src/lib/components/MentionEditor.svelte
rename to frontend/src/lib/shared/discussion/MentionEditor.svelte
diff --git a/frontend/src/lib/components/PersonMentionEditor.svelte b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonMentionEditor.svelte
rename to frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
diff --git a/frontend/src/lib/components/PersonMentionEditor.svelte.spec.ts b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonMentionEditor.svelte.spec.ts
rename to frontend/src/lib/shared/discussion/PersonMentionEditor.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonMentionEditor.test-host.svelte b/frontend/src/lib/shared/discussion/PersonMentionEditor.test-host.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonMentionEditor.test-host.svelte
rename to frontend/src/lib/shared/discussion/PersonMentionEditor.test-host.svelte
diff --git a/frontend/src/lib/components/HelpPopover.svelte b/frontend/src/lib/shared/help/HelpPopover.svelte
similarity index 100%
rename from frontend/src/lib/components/HelpPopover.svelte
rename to frontend/src/lib/shared/help/HelpPopover.svelte
diff --git a/frontend/src/lib/components/HelpPopover.svelte.spec.ts b/frontend/src/lib/shared/help/HelpPopover.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/HelpPopover.svelte.spec.ts
rename to frontend/src/lib/shared/help/HelpPopover.svelte.spec.ts
diff --git a/frontend/src/lib/components/TranscribeCoachEmptyState.svelte b/frontend/src/lib/shared/help/TranscribeCoachEmptyState.svelte
similarity index 100%
rename from frontend/src/lib/components/TranscribeCoachEmptyState.svelte
rename to frontend/src/lib/shared/help/TranscribeCoachEmptyState.svelte
diff --git a/frontend/src/lib/components/TranscribeCoachEmptyState.svelte.spec.ts b/frontend/src/lib/shared/help/TranscribeCoachEmptyState.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TranscribeCoachEmptyState.svelte.spec.ts
rename to frontend/src/lib/shared/help/TranscribeCoachEmptyState.svelte.spec.ts
diff --git a/frontend/src/lib/components/TranscribeDragDemo.svelte b/frontend/src/lib/shared/help/TranscribeDragDemo.svelte
similarity index 100%
rename from frontend/src/lib/components/TranscribeDragDemo.svelte
rename to frontend/src/lib/shared/help/TranscribeDragDemo.svelte
diff --git a/frontend/src/lib/components/TranscribeDragDemo.svelte.spec.ts b/frontend/src/lib/shared/help/TranscribeDragDemo.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TranscribeDragDemo.svelte.spec.ts
rename to frontend/src/lib/shared/help/TranscribeDragDemo.svelte.spec.ts
diff --git a/frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts b/frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
index 3de2a66d..e2983188 100644
--- a/frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
+++ b/frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
-const { createTypeahead } = await import('../useTypeahead.svelte');
+const { createTypeahead } = await import('./useTypeahead.svelte');
 
 describe('createTypeahead', () => {
 	beforeEach(() => {
diff --git a/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts b/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
index 9225a956..d85dc4c3 100644
--- a/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
+++ b/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
@@ -14,7 +14,7 @@ vi.mock('$app/navigation', () => ({
 	goto: mockGoto
 }));
 
-const { createUnsavedWarning } = await import('../useUnsavedWarning.svelte');
+const { createUnsavedWarning } = await import('./useUnsavedWarning.svelte');
 
 function simulateNavigate(href: string | null = '/somewhere') {
 	const cancel = vi.fn();
diff --git a/frontend/src/lib/components/BackButton.svelte b/frontend/src/lib/shared/primitives/BackButton.svelte
similarity index 100%
rename from frontend/src/lib/components/BackButton.svelte
rename to frontend/src/lib/shared/primitives/BackButton.svelte
diff --git a/frontend/src/lib/components/BackButton.svelte.spec.ts b/frontend/src/lib/shared/primitives/BackButton.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/BackButton.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/BackButton.svelte.spec.ts
diff --git a/frontend/src/lib/components/ConfirmDialog.svelte b/frontend/src/lib/shared/primitives/ConfirmDialog.svelte
similarity index 100%
rename from frontend/src/lib/components/ConfirmDialog.svelte
rename to frontend/src/lib/shared/primitives/ConfirmDialog.svelte
diff --git a/frontend/src/lib/components/ConfirmDialog.svelte.spec.ts b/frontend/src/lib/shared/primitives/ConfirmDialog.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ConfirmDialog.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/ConfirmDialog.svelte.spec.ts
diff --git a/frontend/src/lib/components/ContributorStack.svelte b/frontend/src/lib/shared/primitives/ContributorStack.svelte
similarity index 100%
rename from frontend/src/lib/components/ContributorStack.svelte
rename to frontend/src/lib/shared/primitives/ContributorStack.svelte
diff --git a/frontend/src/lib/components/ContributorStack.svelte.spec.ts b/frontend/src/lib/shared/primitives/ContributorStack.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ContributorStack.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/ContributorStack.svelte.spec.ts
diff --git a/frontend/src/lib/components/DateInput.svelte b/frontend/src/lib/shared/primitives/DateInput.svelte
similarity index 100%
rename from frontend/src/lib/components/DateInput.svelte
rename to frontend/src/lib/shared/primitives/DateInput.svelte
diff --git a/frontend/src/lib/components/DateInput.svelte.spec.ts b/frontend/src/lib/shared/primitives/DateInput.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DateInput.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/DateInput.svelte.spec.ts
diff --git a/frontend/src/lib/components/DistributionBar.svelte b/frontend/src/lib/shared/primitives/DistributionBar.svelte
similarity index 100%
rename from frontend/src/lib/components/DistributionBar.svelte
rename to frontend/src/lib/shared/primitives/DistributionBar.svelte
diff --git a/frontend/src/lib/components/DistributionBar.svelte.spec.ts b/frontend/src/lib/shared/primitives/DistributionBar.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DistributionBar.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/DistributionBar.svelte.spec.ts
diff --git a/frontend/src/lib/components/ExpandableText.svelte b/frontend/src/lib/shared/primitives/ExpandableText.svelte
similarity index 100%
rename from frontend/src/lib/components/ExpandableText.svelte
rename to frontend/src/lib/shared/primitives/ExpandableText.svelte
diff --git a/frontend/src/lib/components/GroupDivider.svelte b/frontend/src/lib/shared/primitives/GroupDivider.svelte
similarity index 100%
rename from frontend/src/lib/components/GroupDivider.svelte
rename to frontend/src/lib/shared/primitives/GroupDivider.svelte
diff --git a/frontend/src/lib/components/GroupDivider.svelte.spec.ts b/frontend/src/lib/shared/primitives/GroupDivider.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/GroupDivider.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/GroupDivider.svelte.spec.ts
diff --git a/frontend/src/lib/components/LanguageSwitcher.svelte b/frontend/src/lib/shared/primitives/LanguageSwitcher.svelte
similarity index 100%
rename from frontend/src/lib/components/LanguageSwitcher.svelte
rename to frontend/src/lib/shared/primitives/LanguageSwitcher.svelte
diff --git a/frontend/src/lib/components/LanguageSwitcher.svelte.spec.ts b/frontend/src/lib/shared/primitives/LanguageSwitcher.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/LanguageSwitcher.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/LanguageSwitcher.svelte.spec.ts
diff --git a/frontend/src/lib/components/OverflowPillButton.svelte b/frontend/src/lib/shared/primitives/OverflowPillButton.svelte
similarity index 100%
rename from frontend/src/lib/components/OverflowPillButton.svelte
rename to frontend/src/lib/shared/primitives/OverflowPillButton.svelte
diff --git a/frontend/src/lib/components/OverflowPillButton.svelte.spec.ts b/frontend/src/lib/shared/primitives/OverflowPillButton.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/OverflowPillButton.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/OverflowPillButton.svelte.spec.ts
diff --git a/frontend/src/lib/components/OverflowPillDisplay.svelte b/frontend/src/lib/shared/primitives/OverflowPillDisplay.svelte
similarity index 100%
rename from frontend/src/lib/components/OverflowPillDisplay.svelte
rename to frontend/src/lib/shared/primitives/OverflowPillDisplay.svelte
diff --git a/frontend/src/lib/components/Pagination.svelte b/frontend/src/lib/shared/primitives/Pagination.svelte
similarity index 100%
rename from frontend/src/lib/components/Pagination.svelte
rename to frontend/src/lib/shared/primitives/Pagination.svelte
diff --git a/frontend/src/lib/components/Pagination.svelte.spec.ts b/frontend/src/lib/shared/primitives/Pagination.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/Pagination.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/Pagination.svelte.spec.ts
diff --git a/frontend/src/lib/components/ProgressRing.svelte b/frontend/src/lib/shared/primitives/ProgressRing.svelte
similarity index 100%
rename from frontend/src/lib/components/ProgressRing.svelte
rename to frontend/src/lib/shared/primitives/ProgressRing.svelte
diff --git a/frontend/src/lib/components/ProgressRing.svelte.spec.ts b/frontend/src/lib/shared/primitives/ProgressRing.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ProgressRing.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/ProgressRing.svelte.spec.ts
diff --git a/frontend/src/lib/components/RichtlinienRuleCard.svelte b/frontend/src/lib/shared/primitives/RichtlinienRuleCard.svelte
similarity index 100%
rename from frontend/src/lib/components/RichtlinienRuleCard.svelte
rename to frontend/src/lib/shared/primitives/RichtlinienRuleCard.svelte
diff --git a/frontend/src/lib/components/RichtlinienRuleCard.svelte.spec.ts b/frontend/src/lib/shared/primitives/RichtlinienRuleCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/RichtlinienRuleCard.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/RichtlinienRuleCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/SortDropdown.svelte b/frontend/src/lib/shared/primitives/SortDropdown.svelte
similarity index 100%
rename from frontend/src/lib/components/SortDropdown.svelte
rename to frontend/src/lib/shared/primitives/SortDropdown.svelte
diff --git a/frontend/src/lib/components/SortDropdown.svelte.spec.ts b/frontend/src/lib/shared/primitives/SortDropdown.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/SortDropdown.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/SortDropdown.svelte.spec.ts
diff --git a/frontend/src/lib/components/ThemeToggle.svelte b/frontend/src/lib/shared/primitives/ThemeToggle.svelte
similarity index 100%
rename from frontend/src/lib/components/ThemeToggle.svelte
rename to frontend/src/lib/shared/primitives/ThemeToggle.svelte
diff --git a/frontend/src/lib/components/ThemeToggle.svelte.spec.ts b/frontend/src/lib/shared/primitives/ThemeToggle.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ThemeToggle.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/ThemeToggle.svelte.spec.ts
diff --git a/frontend/src/lib/components/UnsavedWarningBanner.svelte b/frontend/src/lib/shared/primitives/UnsavedWarningBanner.svelte
similarity index 100%
rename from frontend/src/lib/components/UnsavedWarningBanner.svelte
rename to frontend/src/lib/shared/primitives/UnsavedWarningBanner.svelte
diff --git a/frontend/src/lib/shared/services/confirm.test-host.svelte b/frontend/src/lib/shared/services/confirm.test-host.svelte
index 0d6a8406..249033ec 100644
--- a/frontend/src/lib/shared/services/confirm.test-host.svelte
+++ b/frontend/src/lib/shared/services/confirm.test-host.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { provideConfirmService, type ConfirmService } from './confirm.svelte.js';
-import ConfirmDialog from '$lib/components/ConfirmDialog.svelte';
+import ConfirmDialog from '$lib/shared/primitives/ConfirmDialog.svelte';
 
 let { onReady }: { onReady: (service: ConfirmService) => void } = $props();
 
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index d0539c96..0984c941 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -3,12 +3,12 @@ import './layout.css';
 import { page } from '$app/state';
 import { onMount, untrack } from 'svelte';
 import * as m from '$lib/paraglide/messages.js';
-import LanguageSwitcher from '$lib/components/LanguageSwitcher.svelte';
-import ThemeToggle from '$lib/components/ThemeToggle.svelte';
+import LanguageSwitcher from '$lib/shared/primitives/LanguageSwitcher.svelte';
+import ThemeToggle from '$lib/shared/primitives/ThemeToggle.svelte';
 import NotificationBell from '$lib/notification/NotificationBell.svelte';
 import AppNav from './AppNav.svelte';
 import UserMenu from './UserMenu.svelte';
-import ConfirmDialog from '$lib/components/ConfirmDialog.svelte';
+import ConfirmDialog from '$lib/shared/primitives/ConfirmDialog.svelte';
 import { provideConfirmService } from '$lib/shared/services/confirm.svelte.js';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 41b8e1f2..6e06077d 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import DropZone from './DropZone.svelte';
-import DashboardResumeStrip from '$lib/components/DashboardResumeStrip.svelte';
-import MissionControlStrip from '$lib/components/MissionControlStrip.svelte';
-import DashboardFamilyPulse from '$lib/components/DashboardFamilyPulse.svelte';
+import DashboardResumeStrip from '$lib/shared/dashboard/DashboardResumeStrip.svelte';
+import MissionControlStrip from '$lib/shared/dashboard/MissionControlStrip.svelte';
+import DashboardFamilyPulse from '$lib/shared/dashboard/DashboardFamilyPulse.svelte';
 import DashboardActivityFeed from '$lib/activity/DashboardActivityFeed.svelte';
 import EnrichmentBlock from '$lib/document/EnrichmentBlock.svelte';
 import { m } from '$lib/paraglide/messages.js';
diff --git a/frontend/src/routes/AppNav.svelte b/frontend/src/routes/AppNav.svelte
index 6020312b..344bb207 100644
--- a/frontend/src/routes/AppNav.svelte
+++ b/frontend/src/routes/AppNav.svelte
@@ -2,7 +2,7 @@
 import { page } from '$app/state';
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import LanguageSwitcher from '$lib/components/LanguageSwitcher.svelte';
+import LanguageSwitcher from '$lib/shared/primitives/LanguageSwitcher.svelte';
 
 let { isAdmin = false }: { isAdmin?: boolean } = $props();
 
diff --git a/frontend/src/routes/AuthHeader.svelte b/frontend/src/routes/AuthHeader.svelte
index d2560817..649489e6 100644
--- a/frontend/src/routes/AuthHeader.svelte
+++ b/frontend/src/routes/AuthHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import LanguageSwitcher from '$lib/components/LanguageSwitcher.svelte';
+import LanguageSwitcher from '$lib/shared/primitives/LanguageSwitcher.svelte';
 </script>
 
 <header class="bg-header">
diff --git a/frontend/src/routes/SearchFilterBar.svelte b/frontend/src/routes/SearchFilterBar.svelte
index 4568323b..c2eb816d 100644
--- a/frontend/src/routes/SearchFilterBar.svelte
+++ b/frontend/src/routes/SearchFilterBar.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import TagInput from '$lib/tag/TagInput.svelte';
-import DateInput from '$lib/components/DateInput.svelte';
-import SortDropdown from '$lib/components/SortDropdown.svelte';
+import DateInput from '$lib/shared/primitives/DateInput.svelte';
+import SortDropdown from '$lib/shared/primitives/SortDropdown.svelte';
 import { slide } from 'svelte/transition';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/routes/admin/groups/[id]/+page.svelte b/frontend/src/routes/admin/groups/[id]/+page.svelte
index a2c6877f..ecfb8a5c 100644
--- a/frontend/src/routes/admin/groups/[id]/+page.svelte
+++ b/frontend/src/routes/admin/groups/[id]/+page.svelte
@@ -3,7 +3,7 @@ import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
 import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
+import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/admin/tags/[id]/+page.svelte b/frontend/src/routes/admin/tags/[id]/+page.svelte
index 59b34137..8278d7c5 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.svelte
+++ b/frontend/src/routes/admin/tags/[id]/+page.svelte
@@ -4,7 +4,7 @@ import { replaceState } from '$app/navigation';
 import { page } from '$app/stores';
 import { m } from '$lib/paraglide/messages.js';
 import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
+import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';
 import TagParentPicker from '$lib/tag/TagParentPicker.svelte';
 import TagAncestry from './TagAncestry.svelte';
 import TagChildrenPreview from './TagChildrenPreview.svelte';
diff --git a/frontend/src/routes/admin/users/[id]/+page.svelte b/frontend/src/routes/admin/users/[id]/+page.svelte
index 1870b109..05c8a74a 100644
--- a/frontend/src/routes/admin/users/[id]/+page.svelte
+++ b/frontend/src/routes/admin/users/[id]/+page.svelte
@@ -6,7 +6,7 @@ import UserProfileSection from '$lib/user/UserProfileSection.svelte';
 import UserGroupsSection from '$lib/user/UserGroupsSection.svelte';
 import UserPasswordSection from '$lib/user/UserPasswordSection.svelte';
 import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
+import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/briefwechsel/ConversationTimeline.svelte b/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
index e57f0cd1..3cb2dba9 100644
--- a/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
+++ b/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import DistributionBar from '$lib/components/DistributionBar.svelte';
+import DistributionBar from '$lib/shared/primitives/DistributionBar.svelte';
 import ThumbnailRow from '$lib/document/ThumbnailRow.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
diff --git a/frontend/src/routes/briefwechsel/CorrespondenzFilterControls.svelte b/frontend/src/routes/briefwechsel/CorrespondenzFilterControls.svelte
index 70d2ef45..a3053ee6 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzFilterControls.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzFilterControls.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { slide } from 'svelte/transition';
 import { m } from '$lib/paraglide/messages.js';
-import DateInput from '$lib/components/DateInput.svelte';
+import DateInput from '$lib/shared/primitives/DateInput.svelte';
 
 interface Props {
 	fromDate?: string;
diff --git a/frontend/src/routes/documents/+page.svelte b/frontend/src/routes/documents/+page.svelte
index bedc1507..f0686fba 100644
--- a/frontend/src/routes/documents/+page.svelte
+++ b/frontend/src/routes/documents/+page.svelte
@@ -5,7 +5,7 @@ import { untrack } from 'svelte';
 import { SvelteURLSearchParams } from 'svelte/reactivity';
 import SearchFilterBar from '../SearchFilterBar.svelte';
 import DocumentList from '../DocumentList.svelte';
-import Pagination from '$lib/components/Pagination.svelte';
+import Pagination from '$lib/shared/primitives/Pagination.svelte';
 import BulkSelectionBar from '$lib/document/BulkSelectionBar.svelte';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import { getErrorMessage, parseBackendError } from '$lib/errors';
diff --git a/frontend/src/routes/documents/[id]/edit/+page.svelte b/frontend/src/routes/documents/[id]/edit/+page.svelte
index 14f874dd..9a333120 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.svelte
+++ b/frontend/src/routes/documents/[id]/edit/+page.svelte
@@ -2,7 +2,7 @@
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
 import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
 let { data, form } = $props();
diff --git a/frontend/src/routes/enrich/+page.svelte b/frontend/src/routes/enrich/+page.svelte
index be64e24c..08b29126 100644
--- a/frontend/src/routes/enrich/+page.svelte
+++ b/frontend/src/routes/enrich/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import BulkSelectionBar from '$lib/document/BulkSelectionBar.svelte';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
diff --git a/frontend/src/routes/enrich/[id]/+page.svelte b/frontend/src/routes/enrich/[id]/+page.svelte
index 788f7892..15847b19 100644
--- a/frontend/src/routes/enrich/[id]/+page.svelte
+++ b/frontend/src/routes/enrich/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
 let { data, form } = $props();
diff --git a/frontend/src/routes/geschichten/[id]/+page.svelte b/frontend/src/routes/geschichten/[id]/+page.svelte
index 0d26453b..b13c2189 100644
--- a/frontend/src/routes/geschichten/[id]/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/+page.svelte
@@ -4,7 +4,7 @@ import { m } from '$lib/paraglide/messages.js';
 import { safeHtml } from '$lib/shared/utils/sanitize';
 import { formatDate } from '$lib/shared/utils/date';
 import { getConfirmService } from '$lib/shared/services/confirm.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/geschichten/[id]/edit/+page.svelte b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
index 48b47874..59cbfa1c 100644
--- a/frontend/src/routes/geschichten/[id]/edit/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
@@ -2,7 +2,7 @@
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import { getErrorMessage } from '$lib/errors';
 import type { PageData } from './$types';
 
diff --git a/frontend/src/routes/geschichten/new/+page.svelte b/frontend/src/routes/geschichten/new/+page.svelte
index c578ac91..0e320023 100644
--- a/frontend/src/routes/geschichten/new/+page.svelte
+++ b/frontend/src/routes/geschichten/new/+page.svelte
@@ -2,7 +2,7 @@
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import { getErrorMessage } from '$lib/errors';
 import type { PageData } from './$types';
 
diff --git a/frontend/src/routes/hilfe/transkription/+page.svelte b/frontend/src/routes/hilfe/transkription/+page.svelte
index 967dc51a..4d48efb3 100644
--- a/frontend/src/routes/hilfe/transkription/+page.svelte
+++ b/frontend/src/routes/hilfe/transkription/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import RichtlinienRuleCard from '$lib/components/RichtlinienRuleCard.svelte';
+import RichtlinienRuleCard from '$lib/shared/primitives/RichtlinienRuleCard.svelte';
 
 const rules = [
 	{
diff --git a/frontend/src/routes/persons/[id]/+page.svelte b/frontend/src/routes/persons/[id]/+page.svelte
index 40d168c9..3518f82b 100644
--- a/frontend/src/routes/persons/[id]/+page.svelte
+++ b/frontend/src/routes/persons/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { SvelteMap } from 'svelte/reactivity';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import PersonCard from './PersonCard.svelte';
 import NameHistoryCard from './NameHistoryCard.svelte';
 import CoCorrespondentsList from './CoCorrespondentsList.svelte';
diff --git a/frontend/src/routes/persons/[id]/edit/+page.svelte b/frontend/src/routes/persons/[id]/edit/+page.svelte
index 9e513958..438ce760 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.svelte
+++ b/frontend/src/routes/persons/[id]/edit/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { enhance } from '$app/forms';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import PersonEditForm from './PersonEditForm.svelte';
 import PersonEditSaveBar from './PersonEditSaveBar.svelte';
 import NameHistoryEditCard from './NameHistoryEditCard.svelte';
diff --git a/frontend/src/routes/persons/new/+page.svelte b/frontend/src/routes/persons/new/+page.svelte
index a5c894bd..16a9359a 100644
--- a/frontend/src/routes/persons/new/+page.svelte
+++ b/frontend/src/routes/persons/new/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import BackButton from '$lib/components/BackButton.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
 import PersonTypeSelector from '$lib/person/PersonTypeSelector.svelte';
 import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person/person-validation';