diff --git a/frontend/src/lib/components/GeschichteEditor.svelte b/frontend/src/lib/components/GeschichteEditor.svelte
index 70ff118b..862332fc 100644
--- a/frontend/src/lib/components/GeschichteEditor.svelte
+++ b/frontend/src/lib/components/GeschichteEditor.svelte
@@ -6,7 +6,7 @@ import StarterKit from '@tiptap/starter-kit';
 import { m } from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
 import PersonMultiSelect from './PersonMultiSelect.svelte';
-import DocumentMultiSelect from './DocumentMultiSelect.svelte';
+import DocumentMultiSelect from '$lib/document/DocumentMultiSelect.svelte';
 
 type Geschichte = components['schemas']['Geschichte'];
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/components/MissionControlStrip.svelte b/frontend/src/lib/components/MissionControlStrip.svelte
index 2a026877..21122cd8 100644
--- a/frontend/src/lib/components/MissionControlStrip.svelte
+++ b/frontend/src/lib/components/MissionControlStrip.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
-import SegmentationColumn from './SegmentationColumn.svelte';
+import SegmentationColumn from '$lib/document/SegmentationColumn.svelte';
 import TranscriptionColumn from './TranscriptionColumn.svelte';
-import ReadyColumn from './ReadyColumn.svelte';
+import ReadyColumn from '$lib/document/ReadyColumn.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 type TranscriptionWeeklyStatsDTO = components['schemas']['TranscriptionWeeklyStatsDTO'];
diff --git a/frontend/src/lib/components/OcrTrigger.svelte b/frontend/src/lib/components/OcrTrigger.svelte
index e764263c..f361a4cf 100644
--- a/frontend/src/lib/components/OcrTrigger.svelte
+++ b/frontend/src/lib/components/OcrTrigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import ScriptTypeSelect from './ScriptTypeSelect.svelte';
+import ScriptTypeSelect from '$lib/document/ScriptTypeSelect.svelte';
 
 interface Props {
 	blockCount: number;
diff --git a/frontend/src/lib/components/PersonTypeahead.svelte b/frontend/src/lib/components/PersonTypeahead.svelte
index 55acd69e..1ac3473e 100644
--- a/frontend/src/lib/components/PersonTypeahead.svelte
+++ b/frontend/src/lib/components/PersonTypeahead.svelte
@@ -4,7 +4,7 @@ import type { components } from '$lib/generated/api';
 import { m } from '$lib/paraglide/messages.js';
 import { clickOutside } from '$lib/actions/clickOutside';
 import { createTypeahead } from '$lib/hooks/useTypeahead.svelte';
-import FieldLabelBadge from './document/FieldLabelBadge.svelte';
+import FieldLabelBadge from '$lib/document/FieldLabelBadge.svelte';
 type Person = components['schemas']['Person'];
 
 interface Props {
diff --git a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
similarity index 99%
rename from frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
rename to frontend/src/lib/document/BulkDocumentEditLayout.svelte
index 1bdcc694..63327edb 100644
--- a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
+++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
@@ -5,7 +5,7 @@ import { onDestroy, onMount, untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import { getConfirmService } from '$lib/services/confirm.svelte.js';
 import type { ConfirmService } from '$lib/services/confirm.svelte.js';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import BulkDropZone from './BulkDropZone.svelte';
 import FileSwitcherStrip from './FileSwitcherStrip.svelte';
 import type { FileEntry } from './FileSwitcherStrip.svelte';
@@ -14,7 +14,7 @@ import UploadSaveBar from './UploadSaveBar.svelte';
 import WhoWhenSection from './WhoWhenSection.svelte';
 import DescriptionSection from './DescriptionSection.svelte';
 import PdfViewer from '$lib/components/PdfViewer.svelte';
-import { bulkTitleFromFilename } from '$lib/utils/filename';
+import { bulkTitleFromFilename } from '$lib/document/filename';
 import type { Tag } from '$lib/components/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
diff --git a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte.spec.ts b/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts
similarity index 99%
rename from frontend/src/lib/components/document/BulkDocumentEditLayout.svelte.spec.ts
rename to frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts
index 21a4b13d..415f80f4 100644
--- a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte.spec.ts
+++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts
@@ -317,7 +317,7 @@ describe('BulkDocumentEditLayout', () => {
 
 describe('BulkDocumentEditLayout — mode="edit" discard', () => {
 	it('discard in edit mode clears the selection store and navigates back to /documents', async () => {
-		const { bulkSelectionStore } = await import('$lib/stores/bulkSelection.svelte');
+		const { bulkSelectionStore } = await import('$lib/document/bulkSelection.svelte');
 		bulkSelectionStore.setAll(['doc-1']);
 
 		const { container } = render(BulkDocumentEditLayout, {
diff --git a/frontend/src/lib/components/document/BulkDropZone.svelte b/frontend/src/lib/document/BulkDropZone.svelte
similarity index 100%
rename from frontend/src/lib/components/document/BulkDropZone.svelte
rename to frontend/src/lib/document/BulkDropZone.svelte
diff --git a/frontend/src/lib/components/document/BulkDropZone.svelte.spec.ts b/frontend/src/lib/document/BulkDropZone.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/BulkDropZone.svelte.spec.ts
rename to frontend/src/lib/document/BulkDropZone.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/BulkSelectionBar.svelte b/frontend/src/lib/document/BulkSelectionBar.svelte
similarity index 97%
rename from frontend/src/lib/components/document/BulkSelectionBar.svelte
rename to frontend/src/lib/document/BulkSelectionBar.svelte
index 27f10174..eef704e8 100644
--- a/frontend/src/lib/components/document/BulkSelectionBar.svelte
+++ b/frontend/src/lib/document/BulkSelectionBar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
 let { canWrite }: { canWrite: boolean } = $props();
 
diff --git a/frontend/src/lib/components/document/BulkSelectionBar.svelte.spec.ts b/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/components/document/BulkSelectionBar.svelte.spec.ts
rename to frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts
index 523b797e..80d2aa87 100644
--- a/frontend/src/lib/components/document/BulkSelectionBar.svelte.spec.ts
+++ b/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts
@@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import { goto } from '$app/navigation';
 import BulkSelectionBar from './BulkSelectionBar.svelte';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
 vi.mock('$app/navigation', () => ({ goto: vi.fn() }));
 
diff --git a/frontend/src/lib/components/DashboardNeedsMetadata.svelte b/frontend/src/lib/document/DashboardNeedsMetadata.svelte
similarity index 100%
rename from frontend/src/lib/components/DashboardNeedsMetadata.svelte
rename to frontend/src/lib/document/DashboardNeedsMetadata.svelte
diff --git a/frontend/src/lib/components/DashboardNeedsMetadata.svelte.spec.ts b/frontend/src/lib/document/DashboardNeedsMetadata.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DashboardNeedsMetadata.svelte.spec.ts
rename to frontend/src/lib/document/DashboardNeedsMetadata.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/DescriptionSection.svelte b/frontend/src/lib/document/DescriptionSection.svelte
similarity index 100%
rename from frontend/src/lib/components/document/DescriptionSection.svelte
rename to frontend/src/lib/document/DescriptionSection.svelte
diff --git a/frontend/src/lib/components/document/DescriptionSection.svelte.spec.ts b/frontend/src/lib/document/DescriptionSection.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/DescriptionSection.svelte.spec.ts
rename to frontend/src/lib/document/DescriptionSection.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/DocumentEditLayout.svelte b/frontend/src/lib/document/DocumentEditLayout.svelte
similarity index 94%
rename from frontend/src/lib/components/document/DocumentEditLayout.svelte
rename to frontend/src/lib/document/DocumentEditLayout.svelte
index 14a558f7..665bc4f9 100644
--- a/frontend/src/lib/components/document/DocumentEditLayout.svelte
+++ b/frontend/src/lib/document/DocumentEditLayout.svelte
@@ -6,11 +6,11 @@ import type { Snippet } from 'svelte';
 import { createFileLoader } from '$lib/hooks/useFileLoader.svelte';
 import { m } from '$lib/paraglide/messages.js';
 import { countRequiredFilled } from '$lib/utils/requiredFields';
-import { validateFile } from '$lib/utils/validateFile';
-import DocumentViewer from '$lib/components/DocumentViewer.svelte';
-import UploadZone from '$lib/components/document/UploadZone.svelte';
-import WhoWhenSection from '$lib/components/document/WhoWhenSection.svelte';
-import DescriptionSection from '$lib/components/document/DescriptionSection.svelte';
+import { validateFile } from '$lib/document/validateFile';
+import DocumentViewer from '$lib/document/DocumentViewer.svelte';
+import UploadZone from '$lib/document/UploadZone.svelte';
+import WhoWhenSection from '$lib/document/WhoWhenSection.svelte';
+import DescriptionSection from '$lib/document/DescriptionSection.svelte';
 import type { Tag } from '$lib/components/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
diff --git a/frontend/src/lib/components/DocumentMetadataDrawer.svelte b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
similarity index 99%
rename from frontend/src/lib/components/DocumentMetadataDrawer.svelte
rename to frontend/src/lib/document/DocumentMetadataDrawer.svelte
index 3baf2b79..a3df7ef3 100644
--- a/frontend/src/lib/components/DocumentMetadataDrawer.svelte
+++ b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { formatDate } from '$lib/utils/date';
-import { formatDocumentStatus } from '$lib/utils/documentStatusLabel';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
 import { getInitials, personAvatarColor } from '$lib/utils/personFormat';
 import RelationshipPill from '$lib/components/RelationshipPill.svelte';
 
diff --git a/frontend/src/lib/components/DocumentMetadataDrawer.svelte.spec.ts b/frontend/src/lib/document/DocumentMetadataDrawer.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DocumentMetadataDrawer.svelte.spec.ts
rename to frontend/src/lib/document/DocumentMetadataDrawer.svelte.spec.ts
diff --git a/frontend/src/lib/components/DocumentMultiSelect.svelte b/frontend/src/lib/document/DocumentMultiSelect.svelte
similarity index 100%
rename from frontend/src/lib/components/DocumentMultiSelect.svelte
rename to frontend/src/lib/document/DocumentMultiSelect.svelte
diff --git a/frontend/src/lib/components/DocumentMultiSelect.svelte.spec.ts b/frontend/src/lib/document/DocumentMultiSelect.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DocumentMultiSelect.svelte.spec.ts
rename to frontend/src/lib/document/DocumentMultiSelect.svelte.spec.ts
diff --git a/frontend/src/lib/components/DocumentRow.svelte b/frontend/src/lib/document/DocumentRow.svelte
similarity index 96%
rename from frontend/src/lib/components/DocumentRow.svelte
rename to frontend/src/lib/document/DocumentRow.svelte
index 2b656a65..ca5d3ce6 100644
--- a/frontend/src/lib/components/DocumentRow.svelte
+++ b/frontend/src/lib/document/DocumentRow.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import type { components } from '$lib/generated/api';
-import { applyOffsets } from '$lib/search';
+import { applyOffsets } from '$lib/document/search';
 import { formatDate } from '$lib/utils/date';
 import * as m from '$lib/paraglide/messages.js';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
-import ProgressRing from './ProgressRing.svelte';
-import ContributorStack from './ContributorStack.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
+import ProgressRing from '$lib/components/ProgressRing.svelte';
+import ContributorStack from '$lib/components/ContributorStack.svelte';
 import DocumentThumbnail from './DocumentThumbnail.svelte';
 
 type DocumentSearchItem = components['schemas']['DocumentSearchItem'];
diff --git a/frontend/src/lib/components/DocumentRow.svelte.spec.ts b/frontend/src/lib/document/DocumentRow.svelte.spec.ts
similarity index 99%
rename from frontend/src/lib/components/DocumentRow.svelte.spec.ts
rename to frontend/src/lib/document/DocumentRow.svelte.spec.ts
index f7d0b92a..19b3c66a 100644
--- a/frontend/src/lib/components/DocumentRow.svelte.spec.ts
+++ b/frontend/src/lib/document/DocumentRow.svelte.spec.ts
@@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import { goto } from '$app/navigation';
 import DocumentRow from './DocumentRow.svelte';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import type { components } from '$lib/generated/api';
 
 vi.mock('$app/navigation', () => ({ goto: vi.fn() }));
diff --git a/frontend/src/lib/components/DocumentStatusChip.svelte b/frontend/src/lib/document/DocumentStatusChip.svelte
similarity index 100%
rename from frontend/src/lib/components/DocumentStatusChip.svelte
rename to frontend/src/lib/document/DocumentStatusChip.svelte
diff --git a/frontend/src/lib/components/DocumentThumbnail.svelte b/frontend/src/lib/document/DocumentThumbnail.svelte
similarity index 100%
rename from frontend/src/lib/components/DocumentThumbnail.svelte
rename to frontend/src/lib/document/DocumentThumbnail.svelte
diff --git a/frontend/src/lib/components/DocumentTopBar.svelte b/frontend/src/lib/document/DocumentTopBar.svelte
similarity index 97%
rename from frontend/src/lib/components/DocumentTopBar.svelte
rename to frontend/src/lib/document/DocumentTopBar.svelte
index 5e480a55..dc3c99e0 100644
--- a/frontend/src/lib/components/DocumentTopBar.svelte
+++ b/frontend/src/lib/document/DocumentTopBar.svelte
@@ -3,10 +3,10 @@ import { m } from '$lib/paraglide/messages.js';
 import { slide } from 'svelte/transition';
 import { formatDate } from '$lib/utils/date';
 import { clickOutside } from '$lib/actions/clickOutside';
-import PersonChipRow from './PersonChipRow.svelte';
-import OverflowPillButton from './OverflowPillButton.svelte';
+import PersonChipRow from '$lib/components/PersonChipRow.svelte';
+import OverflowPillButton from '$lib/components/OverflowPillButton.svelte';
 import DocumentMetadataDrawer from './DocumentMetadataDrawer.svelte';
-import BackButton from './BackButton.svelte';
+import BackButton from '$lib/components/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/components/DocumentViewer.svelte b/frontend/src/lib/document/DocumentViewer.svelte
similarity index 98%
rename from frontend/src/lib/components/DocumentViewer.svelte
rename to frontend/src/lib/document/DocumentViewer.svelte
index b22f3d6b..a3aa29a7 100644
--- a/frontend/src/lib/components/DocumentViewer.svelte
+++ b/frontend/src/lib/document/DocumentViewer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import PdfViewer from './PdfViewer.svelte';
+import PdfViewer from '$lib/components/PdfViewer.svelte';
 
 type Doc = {
 	id: string;
diff --git a/frontend/src/lib/components/EnrichmentBlock.svelte b/frontend/src/lib/document/EnrichmentBlock.svelte
similarity index 100%
rename from frontend/src/lib/components/EnrichmentBlock.svelte
rename to frontend/src/lib/document/EnrichmentBlock.svelte
diff --git a/frontend/src/lib/components/EnrichmentBlock.svelte.spec.ts b/frontend/src/lib/document/EnrichmentBlock.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/EnrichmentBlock.svelte.spec.ts
rename to frontend/src/lib/document/EnrichmentBlock.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/FieldLabelBadge.svelte b/frontend/src/lib/document/FieldLabelBadge.svelte
similarity index 100%
rename from frontend/src/lib/components/document/FieldLabelBadge.svelte
rename to frontend/src/lib/document/FieldLabelBadge.svelte
diff --git a/frontend/src/lib/components/document/FieldLabelBadge.svelte.spec.ts b/frontend/src/lib/document/FieldLabelBadge.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/FieldLabelBadge.svelte.spec.ts
rename to frontend/src/lib/document/FieldLabelBadge.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/FileSwitcherStrip.svelte b/frontend/src/lib/document/FileSwitcherStrip.svelte
similarity index 100%
rename from frontend/src/lib/components/document/FileSwitcherStrip.svelte
rename to frontend/src/lib/document/FileSwitcherStrip.svelte
diff --git a/frontend/src/lib/components/document/FileSwitcherStrip.svelte.spec.ts b/frontend/src/lib/document/FileSwitcherStrip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/FileSwitcherStrip.svelte.spec.ts
rename to frontend/src/lib/document/FileSwitcherStrip.svelte.spec.ts
diff --git a/frontend/src/lib/components/ReadyColumn.svelte b/frontend/src/lib/document/ReadyColumn.svelte
similarity index 97%
rename from frontend/src/lib/components/ReadyColumn.svelte
rename to frontend/src/lib/document/ReadyColumn.svelte
index 680b9d0c..50ab73bb 100644
--- a/frontend/src/lib/components/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/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from './ContributorStack.svelte';
+import ContributorStack from '$lib/components/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/components/ReadyColumn.svelte.spec.ts b/frontend/src/lib/document/ReadyColumn.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ReadyColumn.svelte.spec.ts
rename to frontend/src/lib/document/ReadyColumn.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/ScopeCard.svelte b/frontend/src/lib/document/ScopeCard.svelte
similarity index 100%
rename from frontend/src/lib/components/document/ScopeCard.svelte
rename to frontend/src/lib/document/ScopeCard.svelte
diff --git a/frontend/src/lib/components/document/ScopeCard.svelte.spec.ts b/frontend/src/lib/document/ScopeCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/ScopeCard.svelte.spec.ts
rename to frontend/src/lib/document/ScopeCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/ScriptTypeSelect.svelte b/frontend/src/lib/document/ScriptTypeSelect.svelte
similarity index 100%
rename from frontend/src/lib/components/ScriptTypeSelect.svelte
rename to frontend/src/lib/document/ScriptTypeSelect.svelte
diff --git a/frontend/src/lib/components/SegmentationColumn.svelte b/frontend/src/lib/document/SegmentationColumn.svelte
similarity index 96%
rename from frontend/src/lib/components/SegmentationColumn.svelte
rename to frontend/src/lib/document/SegmentationColumn.svelte
index e0ce338d..e7eb7be8 100644
--- a/frontend/src/lib/components/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/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from './ContributorStack.svelte';
+import ContributorStack from '$lib/components/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/components/SegmentationColumn.svelte.spec.ts b/frontend/src/lib/document/SegmentationColumn.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/SegmentationColumn.svelte.spec.ts
rename to frontend/src/lib/document/SegmentationColumn.svelte.spec.ts
diff --git a/frontend/src/lib/components/ThumbnailRow.svelte b/frontend/src/lib/document/ThumbnailRow.svelte
similarity index 100%
rename from frontend/src/lib/components/ThumbnailRow.svelte
rename to frontend/src/lib/document/ThumbnailRow.svelte
diff --git a/frontend/src/lib/components/ThumbnailRow.svelte.spec.ts b/frontend/src/lib/document/ThumbnailRow.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ThumbnailRow.svelte.spec.ts
rename to frontend/src/lib/document/ThumbnailRow.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/UploadSaveBar.svelte b/frontend/src/lib/document/UploadSaveBar.svelte
similarity index 100%
rename from frontend/src/lib/components/document/UploadSaveBar.svelte
rename to frontend/src/lib/document/UploadSaveBar.svelte
diff --git a/frontend/src/lib/components/document/UploadSaveBar.svelte.spec.ts b/frontend/src/lib/document/UploadSaveBar.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/UploadSaveBar.svelte.spec.ts
rename to frontend/src/lib/document/UploadSaveBar.svelte.spec.ts
diff --git a/frontend/src/lib/components/UploadSuccessBanner.svelte b/frontend/src/lib/document/UploadSuccessBanner.svelte
similarity index 100%
rename from frontend/src/lib/components/UploadSuccessBanner.svelte
rename to frontend/src/lib/document/UploadSuccessBanner.svelte
diff --git a/frontend/src/lib/components/UploadSuccessBanner.svelte.spec.ts b/frontend/src/lib/document/UploadSuccessBanner.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/UploadSuccessBanner.svelte.spec.ts
rename to frontend/src/lib/document/UploadSuccessBanner.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/UploadZone.svelte b/frontend/src/lib/document/UploadZone.svelte
similarity index 100%
rename from frontend/src/lib/components/document/UploadZone.svelte
rename to frontend/src/lib/document/UploadZone.svelte
diff --git a/frontend/src/lib/components/document/UploadZone.svelte.spec.ts b/frontend/src/lib/document/UploadZone.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/UploadZone.svelte.spec.ts
rename to frontend/src/lib/document/UploadZone.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/UploadZone.svelte.test.ts b/frontend/src/lib/document/UploadZone.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/components/document/UploadZone.svelte.test.ts
rename to frontend/src/lib/document/UploadZone.svelte.test.ts
diff --git a/frontend/src/lib/components/document/WhoWhenSection.svelte b/frontend/src/lib/document/WhoWhenSection.svelte
similarity index 100%
rename from frontend/src/lib/components/document/WhoWhenSection.svelte
rename to frontend/src/lib/document/WhoWhenSection.svelte
diff --git a/frontend/src/lib/components/document/WhoWhenSection.svelte.spec.ts b/frontend/src/lib/document/WhoWhenSection.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/document/WhoWhenSection.svelte.spec.ts
rename to frontend/src/lib/document/WhoWhenSection.svelte.spec.ts
diff --git a/frontend/src/lib/components/__mocks__/navigatingStore.ts b/frontend/src/lib/document/__mocks__/navigatingStore.ts
similarity index 100%
rename from frontend/src/lib/components/__mocks__/navigatingStore.ts
rename to frontend/src/lib/document/__mocks__/navigatingStore.ts
diff --git a/frontend/src/lib/stores/bulkSelection.svelte.spec.ts b/frontend/src/lib/document/bulkSelection.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/stores/bulkSelection.svelte.spec.ts
rename to frontend/src/lib/document/bulkSelection.svelte.spec.ts
diff --git a/frontend/src/lib/stores/bulkSelection.svelte.ts b/frontend/src/lib/document/bulkSelection.svelte.ts
similarity index 100%
rename from frontend/src/lib/stores/bulkSelection.svelte.ts
rename to frontend/src/lib/document/bulkSelection.svelte.ts
diff --git a/frontend/src/lib/utils/documentStatusLabel.spec.ts b/frontend/src/lib/document/documentStatusLabel.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/documentStatusLabel.spec.ts
rename to frontend/src/lib/document/documentStatusLabel.spec.ts
diff --git a/frontend/src/lib/utils/documentStatusLabel.ts b/frontend/src/lib/document/documentStatusLabel.ts
similarity index 100%
rename from frontend/src/lib/utils/documentStatusLabel.ts
rename to frontend/src/lib/document/documentStatusLabel.ts
diff --git a/frontend/src/lib/utils/filename.spec.ts b/frontend/src/lib/document/filename.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/filename.spec.ts
rename to frontend/src/lib/document/filename.spec.ts
diff --git a/frontend/src/lib/utils/filename.ts b/frontend/src/lib/document/filename.ts
similarity index 98%
rename from frontend/src/lib/utils/filename.ts
rename to frontend/src/lib/document/filename.ts
index 582060aa..12769cc4 100644
--- a/frontend/src/lib/utils/filename.ts
+++ b/frontend/src/lib/document/filename.ts
@@ -1,4 +1,4 @@
-import { isoToGerman } from './date';
+import { isoToGerman } from '$lib/utils/date';
 
 export interface FilenameParseResult {
 	/** ISO format: YYYY-MM-DD */
diff --git a/frontend/src/lib/utils/groupDocuments.spec.ts b/frontend/src/lib/document/groupDocuments.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/groupDocuments.spec.ts
rename to frontend/src/lib/document/groupDocuments.spec.ts
diff --git a/frontend/src/lib/utils/groupDocuments.ts b/frontend/src/lib/document/groupDocuments.ts
similarity index 100%
rename from frontend/src/lib/utils/groupDocuments.ts
rename to frontend/src/lib/document/groupDocuments.ts
diff --git a/frontend/src/lib/search.spec.ts b/frontend/src/lib/document/search.spec.ts
similarity index 100%
rename from frontend/src/lib/search.spec.ts
rename to frontend/src/lib/document/search.spec.ts
diff --git a/frontend/src/lib/search.ts b/frontend/src/lib/document/search.ts
similarity index 100%
rename from frontend/src/lib/search.ts
rename to frontend/src/lib/document/search.ts
diff --git a/frontend/src/lib/components/document/TranscriptionSection.svelte b/frontend/src/lib/document/transcription/TranscriptionSection.svelte
similarity index 100%
rename from frontend/src/lib/components/document/TranscriptionSection.svelte
rename to frontend/src/lib/document/transcription/TranscriptionSection.svelte
diff --git a/frontend/src/lib/utils/validateFile.spec.ts b/frontend/src/lib/document/validateFile.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/validateFile.spec.ts
rename to frontend/src/lib/document/validateFile.spec.ts
diff --git a/frontend/src/lib/utils/validateFile.ts b/frontend/src/lib/document/validateFile.ts
similarity index 100%
rename from frontend/src/lib/utils/validateFile.ts
rename to frontend/src/lib/document/validateFile.ts
diff --git a/frontend/src/lib/utils/personFormat.ts b/frontend/src/lib/utils/personFormat.ts
index 86fd7ad7..7b08ae0a 100644
--- a/frontend/src/lib/utils/personFormat.ts
+++ b/frontend/src/lib/utils/personFormat.ts
@@ -1,4 +1,4 @@
-import { formatDocumentStatus } from './documentStatusLabel';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
 import { formatDate } from './date';
 
 type Person = { firstName?: string | null; lastName: string; displayName: string };
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 52340f28..2f198be8 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -10,7 +10,7 @@ import AppNav from './AppNav.svelte';
 import UserMenu from './UserMenu.svelte';
 import ConfirmDialog from '$lib/components/ConfirmDialog.svelte';
 import { provideConfirmService } from '$lib/services/confirm.svelte.js';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
 let { children, data } = $props();
 
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index ce7b5328..41b8e1f2 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -4,7 +4,7 @@ import DashboardResumeStrip from '$lib/components/DashboardResumeStrip.svelte';
 import MissionControlStrip from '$lib/components/MissionControlStrip.svelte';
 import DashboardFamilyPulse from '$lib/components/DashboardFamilyPulse.svelte';
 import DashboardActivityFeed from '$lib/activity/DashboardActivityFeed.svelte';
-import EnrichmentBlock from '$lib/components/EnrichmentBlock.svelte';
+import EnrichmentBlock from '$lib/document/EnrichmentBlock.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 let { data } = $props();
diff --git a/frontend/src/routes/DocumentList.svelte b/frontend/src/routes/DocumentList.svelte
index 6ec6dd83..eb134fd0 100644
--- a/frontend/src/routes/DocumentList.svelte
+++ b/frontend/src/routes/DocumentList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import DocumentRow from '$lib/components/DocumentRow.svelte';
+import DocumentRow from '$lib/document/DocumentRow.svelte';
 import { SvelteMap } from 'svelte/reactivity';
 import type { components } from '$lib/generated/api';
 
diff --git a/frontend/src/routes/briefwechsel/ConversationTimeline.svelte b/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
index e1a342c1..e57f0cd1 100644
--- a/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
+++ b/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import DistributionBar from '$lib/components/DistributionBar.svelte';
-import ThumbnailRow from '$lib/components/ThumbnailRow.svelte';
+import ThumbnailRow from '$lib/document/ThumbnailRow.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 type Tag = { id: string; name: string };
diff --git a/frontend/src/routes/documents/+page.svelte b/frontend/src/routes/documents/+page.svelte
index 60c0c299..bedc1507 100644
--- a/frontend/src/routes/documents/+page.svelte
+++ b/frontend/src/routes/documents/+page.svelte
@@ -6,8 +6,8 @@ import { SvelteURLSearchParams } from 'svelte/reactivity';
 import SearchFilterBar from '../SearchFilterBar.svelte';
 import DocumentList from '../DocumentList.svelte';
 import Pagination from '$lib/components/Pagination.svelte';
-import BulkSelectionBar from '$lib/components/document/BulkSelectionBar.svelte';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import BulkSelectionBar from '$lib/document/BulkSelectionBar.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import { getErrorMessage, parseBackendError } from '$lib/errors';
 import * as m from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/routes/documents/[id]/+page.svelte b/frontend/src/routes/documents/[id]/+page.svelte
index 49810b90..e0811a14 100644
--- a/frontend/src/routes/documents/[id]/+page.svelte
+++ b/frontend/src/routes/documents/[id]/+page.svelte
@@ -3,8 +3,8 @@ import { onMount, onDestroy, tick } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import { page } from '$app/state';
 import { replaceState } from '$app/navigation';
-import DocumentTopBar from '$lib/components/DocumentTopBar.svelte';
-import DocumentViewer from '$lib/components/DocumentViewer.svelte';
+import DocumentTopBar from '$lib/document/DocumentTopBar.svelte';
+import DocumentViewer from '$lib/document/DocumentViewer.svelte';
 import TranscriptionEditView from '$lib/components/TranscriptionEditView.svelte';
 import TranscriptionReadView from '$lib/components/TranscriptionReadView.svelte';
 import TranscriptionPanelHeader from '$lib/components/TranscriptionPanelHeader.svelte';
diff --git a/frontend/src/routes/documents/[id]/edit/+page.svelte b/frontend/src/routes/documents/[id]/edit/+page.svelte
index fcd0f2a9..6aceaca8 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.svelte
+++ b/frontend/src/routes/documents/[id]/edit/+page.svelte
@@ -3,7 +3,7 @@ import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
 import { getConfirmService } from '$lib/services/confirm.svelte.js';
 import BackButton from '$lib/components/BackButton.svelte';
-import DocumentEditLayout from '$lib/components/document/DocumentEditLayout.svelte';
+import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/documents/bulk-edit/+page.svelte b/frontend/src/routes/documents/bulk-edit/+page.svelte
index ba57e0e4..0d69fe07 100644
--- a/frontend/src/routes/documents/bulk-edit/+page.svelte
+++ b/frontend/src/routes/documents/bulk-edit/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { onMount } from 'svelte';
 import { goto } from '$app/navigation';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import BulkDocumentEditLayout, {
 	type BulkEditEntry
-} from '$lib/components/document/BulkDocumentEditLayout.svelte';
+} from '$lib/document/BulkDocumentEditLayout.svelte';
 import { getErrorMessage, parseBackendError } from '$lib/errors';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/routes/documents/new/+page.svelte b/frontend/src/routes/documents/new/+page.svelte
index c4cb69f8..bd67c0b6 100644
--- a/frontend/src/routes/documents/new/+page.svelte
+++ b/frontend/src/routes/documents/new/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import BulkDocumentEditLayout from '$lib/components/document/BulkDocumentEditLayout.svelte';
+import BulkDocumentEditLayout from '$lib/document/BulkDocumentEditLayout.svelte';
 
 let { data } = $props();
 </script>
diff --git a/frontend/src/routes/documents/new/FileSectionNew.svelte b/frontend/src/routes/documents/new/FileSectionNew.svelte
index e22d2e0d..bfb5e0f1 100644
--- a/frontend/src/routes/documents/new/FileSectionNew.svelte
+++ b/frontend/src/routes/documents/new/FileSectionNew.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { parseFilename, stripExtension, type FilenameParseResult } from '$lib/utils/filename';
+import { parseFilename, stripExtension, type FilenameParseResult } from '$lib/document/filename';
 
 let {
 	onfileParsed
diff --git a/frontend/src/routes/enrich/+page.svelte b/frontend/src/routes/enrich/+page.svelte
index ff0a1136..be64e24c 100644
--- a/frontend/src/routes/enrich/+page.svelte
+++ b/frontend/src/routes/enrich/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import BackButton from '$lib/components/BackButton.svelte';
-import BulkSelectionBar from '$lib/components/document/BulkSelectionBar.svelte';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
+import BulkSelectionBar from '$lib/document/BulkSelectionBar.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 
 let { data } = $props();
 
diff --git a/frontend/src/routes/enrich/[id]/+page.svelte b/frontend/src/routes/enrich/[id]/+page.svelte
index 0d7e22d8..788f7892 100644
--- a/frontend/src/routes/enrich/[id]/+page.svelte
+++ b/frontend/src/routes/enrich/[id]/+page.svelte
@@ -2,7 +2,7 @@
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
 import BackButton from '$lib/components/BackButton.svelte';
-import DocumentEditLayout from '$lib/components/document/DocumentEditLayout.svelte';
+import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/persons/[id]/PersonDocumentList.svelte b/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
index 228c8f12..85446776 100644
--- a/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
+++ b/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { formatDate } from '$lib/utils/date';
-import { formatDocumentStatus } from '$lib/utils/documentStatusLabel';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
 import { sortDocumentsByDate, type SortDir } from '$lib/utils/sort';
-import DocumentThumbnail from '$lib/components/DocumentThumbnail.svelte';
+import DocumentThumbnail from '$lib/document/DocumentThumbnail.svelte';
 
 const DOCS_PREVIEW_LIMIT = 5;