diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 389ab11a..a2d9d227 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Upload screenshots
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: unit-test-screenshots
           path: frontend/test-results/screenshots/
diff --git a/frontend/CLAUDE.md b/frontend/CLAUDE.md
index 551a1f34..47b2d1b9 100644
--- a/frontend/CLAUDE.md
+++ b/frontend/CLAUDE.md
@@ -35,24 +35,40 @@ src/
 │   ├── api/             # Internal API proxies (server-side only)
 │   ├── login/ logout/   # Auth pages
 │   └── ...
-├── lib/
-│   ├── components/      # Reusable Svelte components
-│   │   ├── document/    # Document-specific components
-│   │   ├── chronik/     # Activity feed components
-│   │   └── user/        # User-related components
+├── lib/                 # Domain-based package structure (mirrors backend)
+│   ├── document/        # Document domain: components, stores, services, utils
+│   │   ├── annotation/  # Annotation overlay components
+│   │   ├── comment/     # Comment thread components
+│   │   └── transcription/ # Transcription editor + block logic
+│   ├── person/          # Person domain: chips, typeahead, avatar, format
+│   │   ├── relationship/ # Relationship form + chip components
+│   │   └── genealogy/   # Stammbaum (family tree) components
+│   ├── tag/             # Tag domain: TagInput, TagChipList, TagParentPicker
+│   ├── geschichte/      # Geschichte (story) domain: editor + card
+│   ├── notification/    # Notification bell + dropdown + store
+│   ├── activity/        # Activity feed (Chronik) components
+│   ├── conversation/    # Bilateral conversation (Briefwechsel) components
+│   ├── ocr/             # OCR progress, training cards, trigger
+│   ├── user/            # User profile/password/groups section components
+│   ├── shared/          # Cross-domain utilities and primitives
+│   │   ├── actions/     # Svelte actions (clickOutside, etc.)
+│   │   ├── hooks/       # Reusable Svelte state hooks (useTypeahead, etc.)
+│   │   ├── server/      # Server-only utilities (locale, session)
+│   │   ├── services/    # Client-side service helpers
+│   │   ├── utils/       # Pure utility functions (date, search, etc.)
+│   │   ├── primitives/  # Generic UI primitives (BackButton, ProgressRing, etc.)
+│   │   ├── dashboard/   # Dashboard stat components
+│   │   ├── discussion/  # CommentThread + shared discussion UI
+│   │   ├── help/        # Help/FAQ page components
+│   │   ├── api.server.ts # Typed API client factory
+│   │   ├── errors.ts    # Error code mapping (mirrors backend ErrorCode)
+│   │   ├── types.ts     # Shared TypeScript types
+│   │   ├── relativeTime.ts # Relative time formatting
+│   │   └── utils.ts     # Top-level shared utilities
 │   ├── generated/       # Auto-generated API types (openapi-typescript)
-│   ├── server/          # Server-only utilities (db, auth helpers)
-│   ├── services/        # Client-side service logic
-│   ├── stores/          # Svelte stores (global state)
-│   ├── types.ts         # Shared TypeScript types
-│   ├── errors.ts        # Error code mapping (mirrors backend ErrorCode)
-│   ├── api.server.ts    # Typed API client factory
-│   ├── utils.ts         # Shared utilities
-│   ├── relativeTime.ts  # Time formatting
-│   ├── search.ts        # Search utilities
 │   └── paraglide/       # Generated i18n code
 ├── hooks/               # SvelteKit hooks (handle, handleFetch)
-└── actions/             # Custom Svelte actions (click outside, etc.)
+└── ...                  # Other SvelteKit config files
 ```
 
 ## API Client Pattern
@@ -130,14 +146,15 @@ Card pattern for content sections:
 
 ## Key UI Components
 
-| Component            | Props                                                | Description                           |
-| -------------------- | ---------------------------------------------------- | ------------------------------------- |
-| `PersonTypeahead`    | `name`, `label`, `value`, `initialName`, `on:change` | Single-person selector with typeahead |
-| `PersonMultiSelect`  | `selectedPersons` (bind)                             | Chip-based multi-person selector      |
-| `TagInput`           | `tags` (bind), `allowCreation?`, `on:change`         | Tag chip input with typeahead         |
-| `PdfViewer`          | `url`, `annotations`, `on:annotation`                | PDF rendering with annotation overlay |
-| `TranscriptionBlock` | `block`, `mode`                                      | Read/edit transcription block         |
-| `DocumentTopBar`     | `document`                                           | Responsive document metadata header   |
+| Component            | Location                       | Props                                   | Description                                |
+| -------------------- | ------------------------------ | --------------------------------------- | ------------------------------------------ |
+| `PersonTypeahead`    | `$lib/person/`                 | `name`, `label`, `value`, `initialName` | Single-person selector with typeahead      |
+| `PersonMultiSelect`  | `$lib/person/`                 | `selectedPersons` (bind)                | Chip-based multi-person selector           |
+| `TagInput`           | `$lib/tag/`                    | `tags` (bind), `allowCreation?`         | Tag chip input with typeahead              |
+| `PdfViewer`          | `$lib/document/`               | `url`, `annotations`                    | PDF rendering with annotation overlay      |
+| `TranscriptionBlock` | `$lib/document/transcription/` | `block`, `mode`                         | Read/edit transcription block              |
+| `DocumentTopBar`     | `$lib/document/`               | `document`                              | Responsive document metadata header        |
+| `BackButton`         | `$lib/shared/primitives/`      | —                                       | Calls `history.back()`; 44 px touch target |
 
 ## How to Run
 
diff --git a/frontend/src/hooks.server.ts b/frontend/src/hooks.server.ts
index cd16673b..917ed953 100644
--- a/frontend/src/hooks.server.ts
+++ b/frontend/src/hooks.server.ts
@@ -3,7 +3,7 @@ import { paraglideMiddleware } from '$lib/paraglide/server';
 import { sequence } from '@sveltejs/kit/hooks';
 import { env } from 'process';
 import { cookieName, cookieMaxAge } from '$lib/paraglide/runtime';
-import { detectLocale } from '$lib/server/locale';
+import { detectLocale } from '$lib/shared/server/locale';
 
 const PUBLIC_PATHS = ['/login', '/logout', '/forgot-password', '/reset-password', '/register'];
 
diff --git a/frontend/src/lib/components/chronik/ChronikEmptyState.svelte b/frontend/src/lib/activity/ChronikEmptyState.svelte
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikEmptyState.svelte
rename to frontend/src/lib/activity/ChronikEmptyState.svelte
diff --git a/frontend/src/lib/components/chronik/ChronikEmptyState.svelte.spec.ts b/frontend/src/lib/activity/ChronikEmptyState.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikEmptyState.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikEmptyState.svelte.spec.ts
diff --git a/frontend/src/lib/components/chronik/ChronikErrorCard.svelte b/frontend/src/lib/activity/ChronikErrorCard.svelte
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikErrorCard.svelte
rename to frontend/src/lib/activity/ChronikErrorCard.svelte
diff --git a/frontend/src/lib/components/chronik/ChronikErrorCard.svelte.spec.ts b/frontend/src/lib/activity/ChronikErrorCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikErrorCard.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikErrorCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/chronik/ChronikFilterPills.svelte b/frontend/src/lib/activity/ChronikFilterPills.svelte
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikFilterPills.svelte
rename to frontend/src/lib/activity/ChronikFilterPills.svelte
diff --git a/frontend/src/lib/components/chronik/ChronikFilterPills.svelte.spec.ts b/frontend/src/lib/activity/ChronikFilterPills.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikFilterPills.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikFilterPills.svelte.spec.ts
diff --git a/frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte b/frontend/src/lib/activity/ChronikFuerDichBox.svelte
similarity index 95%
rename from frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte
rename to frontend/src/lib/activity/ChronikFuerDichBox.svelte
index 05d58e56..14a440f1 100644
--- a/frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte
+++ b/frontend/src/lib/activity/ChronikFuerDichBox.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
-import { relativeTime } from '$lib/utils/time';
-import type { NotificationItem } from '$lib/stores/notifications.svelte';
-import { buildCommentHref } from '$lib/utils/commentDeepLink';
+import { relativeTime } from '$lib/shared/utils/time';
+import type { NotificationItem } from '$lib/notification/notifications.svelte';
+import { buildCommentHref } from '$lib/shared/discussion/commentDeepLink';
 
 interface Props {
 	unread: NotificationItem[];
diff --git a/frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte.spec.ts b/frontend/src/lib/activity/ChronikFuerDichBox.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikFuerDichBox.svelte.spec.ts
index c5f2f592..f491dd06 100644
--- a/frontend/src/lib/components/chronik/ChronikFuerDichBox.svelte.spec.ts
+++ b/frontend/src/lib/activity/ChronikFuerDichBox.svelte.spec.ts
@@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte';
 import { page, userEvent } from 'vitest/browser';
 
 import ChronikFuerDichBox from './ChronikFuerDichBox.svelte';
-import type { NotificationItem } from '$lib/stores/notifications.svelte';
+import type { NotificationItem } from '$lib/notification/notifications.svelte';
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/chronik/ChronikRow.svelte b/frontend/src/lib/activity/ChronikRow.svelte
similarity index 97%
rename from frontend/src/lib/components/chronik/ChronikRow.svelte
rename to frontend/src/lib/activity/ChronikRow.svelte
index b752a93a..a324066e 100644
--- a/frontend/src/lib/components/chronik/ChronikRow.svelte
+++ b/frontend/src/lib/activity/ChronikRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
-import { relativeTime } from '$lib/utils/time';
-import { buildCommentHref } from '$lib/utils/commentDeepLink';
+import { relativeTime } from '$lib/shared/utils/time';
+import { buildCommentHref } from '$lib/shared/discussion/commentDeepLink';
 import type { components } from '$lib/generated/api';
 
 type ActivityFeedItemDTO = components['schemas']['ActivityFeedItemDTO'];
diff --git a/frontend/src/lib/components/chronik/ChronikRow.svelte.spec.ts b/frontend/src/lib/activity/ChronikRow.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikRow.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikRow.svelte.spec.ts
diff --git a/frontend/src/lib/components/chronik/ChronikTimeline.svelte b/frontend/src/lib/activity/ChronikTimeline.svelte
similarity index 95%
rename from frontend/src/lib/components/chronik/ChronikTimeline.svelte
rename to frontend/src/lib/activity/ChronikTimeline.svelte
index 1675b719..5892bf65 100644
--- a/frontend/src/lib/components/chronik/ChronikTimeline.svelte
+++ b/frontend/src/lib/activity/ChronikTimeline.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
-import { bucketByDay, type DayBucket } from '$lib/utils/date-buckets';
+import { bucketByDay, type DayBucket } from '$lib/shared/utils/date-buckets';
 import type { components } from '$lib/generated/api';
 import ChronikRow from './ChronikRow.svelte';
 
diff --git a/frontend/src/lib/components/chronik/ChronikTimeline.svelte.spec.ts b/frontend/src/lib/activity/ChronikTimeline.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/chronik/ChronikTimeline.svelte.spec.ts
rename to frontend/src/lib/activity/ChronikTimeline.svelte.spec.ts
diff --git a/frontend/src/lib/components/DashboardActivityFeed.svelte b/frontend/src/lib/activity/DashboardActivityFeed.svelte
similarity index 100%
rename from frontend/src/lib/components/DashboardActivityFeed.svelte
rename to frontend/src/lib/activity/DashboardActivityFeed.svelte
diff --git a/frontend/src/lib/components/DashboardActivityFeed.svelte.spec.ts b/frontend/src/lib/activity/DashboardActivityFeed.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/DashboardActivityFeed.svelte.spec.ts
rename to frontend/src/lib/activity/DashboardActivityFeed.svelte.spec.ts
diff --git a/frontend/src/lib/components/ConversationThumbnail.svelte b/frontend/src/lib/conversation/ConversationThumbnail.svelte
similarity index 100%
rename from frontend/src/lib/components/ConversationThumbnail.svelte
rename to frontend/src/lib/conversation/ConversationThumbnail.svelte
diff --git a/frontend/src/lib/components/ConversationThumbnail.svelte.spec.ts b/frontend/src/lib/conversation/ConversationThumbnail.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/ConversationThumbnail.svelte.spec.ts
rename to frontend/src/lib/conversation/ConversationThumbnail.svelte.spec.ts
diff --git a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
similarity index 97%
rename from frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
rename to frontend/src/lib/document/BulkDocumentEditLayout.svelte
index 1bdcc694..b2623140 100644
--- a/frontend/src/lib/components/document/BulkDocumentEditLayout.svelte
+++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
@@ -3,9 +3,9 @@ import { SvelteMap } from 'svelte/reactivity';
 import { goto } from '$app/navigation';
 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 { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+import type { ConfirmService } from '$lib/shared/services/confirm.svelte.js';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import BulkDropZone from './BulkDropZone.svelte';
 import FileSwitcherStrip from './FileSwitcherStrip.svelte';
 import type { FileEntry } from './FileSwitcherStrip.svelte';
@@ -13,9 +13,9 @@ import ScopeCard from './ScopeCard.svelte';
 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 type { Tag } from '$lib/components/TagInput.svelte';
+import PdfViewer from '$lib/document/viewer/PdfViewer.svelte';
+import { bulkTitleFromFilename } from '$lib/document/filename';
+import type { Tag } from '$lib/tag/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
 type Person = components['schemas']['Person'];
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 97%
rename from frontend/src/lib/components/DashboardNeedsMetadata.svelte
rename to frontend/src/lib/document/DashboardNeedsMetadata.svelte
index 79303308..9bcf1c72 100644
--- a/frontend/src/lib/components/DashboardNeedsMetadata.svelte
+++ b/frontend/src/lib/document/DashboardNeedsMetadata.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
-import { relativeTimeDe } from '$lib/relativeTime';
+import { relativeTimeDe } from '$lib/shared/relativeTime';
 
 type IncompleteDoc = {
 	id: string;
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 98%
rename from frontend/src/lib/components/document/DescriptionSection.svelte
rename to frontend/src/lib/document/DescriptionSection.svelte
index 5c8589e7..a39fc9bd 100644
--- a/frontend/src/lib/components/document/DescriptionSection.svelte
+++ b/frontend/src/lib/document/DescriptionSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { onMount } from 'svelte';
-import TagInput, { type Tag } from '$lib/components/TagInput.svelte';
+import TagInput, { type Tag } from '$lib/tag/TagInput.svelte';
 import FieldLabelBadge from './FieldLabelBadge.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
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 91%
rename from frontend/src/lib/components/document/DocumentEditLayout.svelte
rename to frontend/src/lib/document/DocumentEditLayout.svelte
index 14a558f7..52df8248 100644
--- a/frontend/src/lib/components/document/DocumentEditLayout.svelte
+++ b/frontend/src/lib/document/DocumentEditLayout.svelte
@@ -3,15 +3,15 @@ import { enhance } from '$app/forms';
 import { invalidate } from '$app/navigation';
 import { onMount, onDestroy, untrack } from 'svelte';
 import type { Snippet } from 'svelte';
-import { createFileLoader } from '$lib/hooks/useFileLoader.svelte';
+import { createFileLoader } from '$lib/document/viewer/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 type { Tag } from '$lib/components/TagInput.svelte';
+import { countRequiredFilled } from '$lib/shared/utils/requiredFields';
+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/tag/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/components/DocumentMetadataDrawer.svelte b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
similarity index 96%
rename from frontend/src/lib/components/DocumentMetadataDrawer.svelte
rename to frontend/src/lib/document/DocumentMetadataDrawer.svelte
index 3baf2b79..01ecc62a 100644
--- a/frontend/src/lib/components/DocumentMetadataDrawer.svelte
+++ b/frontend/src/lib/document/DocumentMetadataDrawer.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 { getInitials, personAvatarColor } from '$lib/utils/personFormat';
-import RelationshipPill from '$lib/components/RelationshipPill.svelte';
+import { formatDate } from '$lib/shared/utils/date';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
+import { getInitials, personAvatarColor } from '$lib/person/personFormat';
+import RelationshipPill from '$lib/person/relationship/RelationshipPill.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/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 97%
rename from frontend/src/lib/components/DocumentMultiSelect.svelte
rename to frontend/src/lib/document/DocumentMultiSelect.svelte
index cdef1d62..4dabda60 100644
--- a/frontend/src/lib/components/DocumentMultiSelect.svelte
+++ b/frontend/src/lib/document/DocumentMultiSelect.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import type { components } from '$lib/generated/api';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
-import { formatDate } from '$lib/utils/date';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
+import { formatDate } from '$lib/shared/utils/date';
 
 type Document = components['schemas']['Document'];
 type DocumentSearchItem = components['schemas']['DocumentSearchItem'];
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..70c85ed3 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 { formatDate } from '$lib/utils/date';
+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/stores/bulkSelection.svelte';
-import ProgressRing from './ProgressRing.svelte';
-import ContributorStack from './ContributorStack.svelte';
+import { bulkSelectionStore } from '$lib/document/bulkSelection.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/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 85%
rename from frontend/src/lib/components/DocumentStatusChip.svelte
rename to frontend/src/lib/document/DocumentStatusChip.svelte
index 05857ebc..ce4fa919 100644
--- a/frontend/src/lib/components/DocumentStatusChip.svelte
+++ b/frontend/src/lib/document/DocumentStatusChip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { statusDotClass, statusLabel } from '$lib/utils/personFormat';
+import { statusDotClass, statusLabel } from '$lib/person/personFormat';
 
 type DocumentStatus = 'PLACEHOLDER' | 'UPLOADED' | 'TRANSCRIBED' | 'REVIEWED' | 'ARCHIVED';
 
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 96%
rename from frontend/src/lib/components/DocumentTopBar.svelte
rename to frontend/src/lib/document/DocumentTopBar.svelte
index 5e480a55..96381a69 100644
--- a/frontend/src/lib/components/DocumentTopBar.svelte
+++ b/frontend/src/lib/document/DocumentTopBar.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 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 { formatDate } from '$lib/shared/utils/date';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
+import PersonChipRow from '$lib/person/PersonChipRow.svelte';
+import OverflowPillButton from '$lib/shared/primitives/OverflowPillButton.svelte';
 import DocumentMetadataDrawer from './DocumentMetadataDrawer.svelte';
-import BackButton from './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/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..789a68d7 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/document/viewer/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 94%
rename from frontend/src/lib/components/ReadyColumn.svelte
rename to frontend/src/lib/document/ReadyColumn.svelte
index 680b9d0c..ec38419a 100644
--- a/frontend/src/lib/components/ReadyColumn.svelte
+++ b/frontend/src/lib/document/ReadyColumn.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
-import { formatMCDate } from '$lib/utils/date.js';
+import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from './ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/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 93%
rename from frontend/src/lib/components/SegmentationColumn.svelte
rename to frontend/src/lib/document/SegmentationColumn.svelte
index e0ce338d..2d25cb2d 100644
--- a/frontend/src/lib/components/SegmentationColumn.svelte
+++ b/frontend/src/lib/document/SegmentationColumn.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
-import { formatMCDate } from '$lib/utils/date.js';
+import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from './ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/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 93%
rename from frontend/src/lib/components/ThumbnailRow.svelte
rename to frontend/src/lib/document/ThumbnailRow.svelte
index 16d40e91..a5255112 100644
--- a/frontend/src/lib/components/ThumbnailRow.svelte
+++ b/frontend/src/lib/document/ThumbnailRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-import ConversationThumbnail from '$lib/components/ConversationThumbnail.svelte';
-import TagChipList from '$lib/components/TagChipList.svelte';
-import { formatDate } from '$lib/utils/date';
+import ConversationThumbnail from '$lib/conversation/ConversationThumbnail.svelte';
+import TagChipList from '$lib/tag/TagChipList.svelte';
+import { formatDate } from '$lib/shared/utils/date';
 import * as m from '$lib/paraglide/messages.js';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
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 95%
rename from frontend/src/lib/components/document/WhoWhenSection.svelte
rename to frontend/src/lib/document/WhoWhenSection.svelte
index 12e47cd2..1bda0cab 100644
--- a/frontend/src/lib/components/document/WhoWhenSection.svelte
+++ b/frontend/src/lib/document/WhoWhenSection.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { onMount, untrack } from 'svelte';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
-import PersonMultiSelect from '$lib/components/PersonMultiSelect.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
+import PersonMultiSelect from '$lib/person/PersonMultiSelect.svelte';
 import FieldLabelBadge from './FieldLabelBadge.svelte';
-import { isoToGerman, handleGermanDateInput } from '$lib/utils/date';
+import { isoToGerman, handleGermanDateInput } from '$lib/shared/utils/date';
 import { m } from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
 
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/components/AnnotationEditOverlay.svelte b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte
similarity index 99%
rename from frontend/src/lib/components/AnnotationEditOverlay.svelte
rename to frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte
index d4da250e..1f967e60 100644
--- a/frontend/src/lib/components/AnnotationEditOverlay.svelte
+++ b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { getContext } from 'svelte';
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 import { m } from '$lib/paraglide/messages.js';
 
 type UpdateAnnotationFn = (
diff --git a/frontend/src/lib/components/AnnotationEditOverlay.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte.test.ts
similarity index 97%
rename from frontend/src/lib/components/AnnotationEditOverlay.svelte.test.ts
rename to frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte.test.ts
index 61ab18d6..8dc502e3 100644
--- a/frontend/src/lib/components/AnnotationEditOverlay.svelte.test.ts
+++ b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { render } from 'vitest-browser-svelte';
 import AnnotationEditOverlay from './AnnotationEditOverlay.svelte';
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 
 const annotation: Annotation = {
 	id: 'ann-1',
diff --git a/frontend/src/lib/components/AnnotationLayer.svelte b/frontend/src/lib/document/annotation/AnnotationLayer.svelte
similarity index 98%
rename from frontend/src/lib/components/AnnotationLayer.svelte
rename to frontend/src/lib/document/annotation/AnnotationLayer.svelte
index 129fef36..d392628c 100644
--- a/frontend/src/lib/components/AnnotationLayer.svelte
+++ b/frontend/src/lib/document/annotation/AnnotationLayer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 import AnnotationShape from './AnnotationShape.svelte';
 
 type DrawRect = {
diff --git a/frontend/src/lib/components/AnnotationLayer.svelte.spec.ts b/frontend/src/lib/document/annotation/AnnotationLayer.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/AnnotationLayer.svelte.spec.ts
rename to frontend/src/lib/document/annotation/AnnotationLayer.svelte.spec.ts
diff --git a/frontend/src/lib/components/AnnotationLayer.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationLayer.svelte.test.ts
similarity index 98%
rename from frontend/src/lib/components/AnnotationLayer.svelte.test.ts
rename to frontend/src/lib/document/annotation/AnnotationLayer.svelte.test.ts
index 5c78f3a2..ce69a890 100644
--- a/frontend/src/lib/components/AnnotationLayer.svelte.test.ts
+++ b/frontend/src/lib/document/annotation/AnnotationLayer.svelte.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect } from 'vitest';
 import { render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import AnnotationLayer from './AnnotationLayer.svelte';
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 
 const annotation: Annotation = {
 	id: 'ann-1',
diff --git a/frontend/src/lib/components/AnnotationShape.svelte b/frontend/src/lib/document/annotation/AnnotationShape.svelte
similarity index 98%
rename from frontend/src/lib/components/AnnotationShape.svelte
rename to frontend/src/lib/document/annotation/AnnotationShape.svelte
index 31be34f4..8bfc7c7b 100644
--- a/frontend/src/lib/components/AnnotationShape.svelte
+++ b/frontend/src/lib/document/annotation/AnnotationShape.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 import AnnotationEditOverlay from './AnnotationEditOverlay.svelte';
 
 let {
diff --git a/frontend/src/lib/components/AnnotationShape.svelte.spec.ts b/frontend/src/lib/document/annotation/AnnotationShape.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/AnnotationShape.svelte.spec.ts
rename to frontend/src/lib/document/annotation/AnnotationShape.svelte.spec.ts
diff --git a/frontend/src/lib/components/AnnotationShape.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationShape.svelte.test.ts
similarity index 95%
rename from frontend/src/lib/components/AnnotationShape.svelte.test.ts
rename to frontend/src/lib/document/annotation/AnnotationShape.svelte.test.ts
index f5ad754e..6bfa387c 100644
--- a/frontend/src/lib/components/AnnotationShape.svelte.test.ts
+++ b/frontend/src/lib/document/annotation/AnnotationShape.svelte.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { render } from 'vitest-browser-svelte';
 import AnnotationShape from './AnnotationShape.svelte';
-import type { Annotation } from '$lib/types';
+import type { Annotation } from '$lib/shared/types';
 
 const annotation: Annotation = {
 	id: 'ann-1',
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..d6fb8ed0 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/shared/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/TranscriptionBlock.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
similarity index 96%
rename from frontend/src/lib/components/TranscriptionBlock.svelte
rename to frontend/src/lib/document/transcription/TranscriptionBlock.svelte
index 417c3fbe..d6e2dd87 100644
--- a/frontend/src/lib/components/TranscriptionBlock.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
-import CommentThread from './CommentThread.svelte';
-import PersonMentionEditor from './PersonMentionEditor.svelte';
-import type { PersonMention } from '$lib/types';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+import CommentThread from '$lib/shared/discussion/CommentThread.svelte';
+import PersonMentionEditor from '$lib/shared/discussion/PersonMentionEditor.svelte';
+import type { PersonMention } from '$lib/shared/types';
 
 const { confirm } = getConfirmService();
 
diff --git a/frontend/src/lib/components/TranscriptionBlock.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte.spec.ts
similarity index 99%
rename from frontend/src/lib/components/TranscriptionBlock.svelte.spec.ts
rename to frontend/src/lib/document/transcription/TranscriptionBlock.svelte.spec.ts
index 85961e75..a9b11698 100644
--- a/frontend/src/lib/components/TranscriptionBlock.svelte.spec.ts
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import TranscriptionBlockHost from './TranscriptionBlock.test-host.svelte';
-import type { ConfirmService } from '$lib/services/confirm.svelte.js';
+import type { ConfirmService } from '$lib/shared/services/confirm.svelte.js';
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/TranscriptionBlock.test-host.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
similarity index 92%
rename from frontend/src/lib/components/TranscriptionBlock.test-host.svelte
rename to frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
index d2e2055d..52cd0acb 100644
--- a/frontend/src/lib/components/TranscriptionBlock.test-host.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-import { provideConfirmService, type ConfirmService } from '$lib/services/confirm.svelte.js';
+import { provideConfirmService, type ConfirmService } from '$lib/shared/services/confirm.svelte.js';
 import TranscriptionBlock from './TranscriptionBlock.svelte';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 type BlockProps = {
 	blockId: string;
diff --git a/frontend/src/lib/components/TranscriptionColumn.svelte b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
similarity index 95%
rename from frontend/src/lib/components/TranscriptionColumn.svelte
rename to frontend/src/lib/document/transcription/TranscriptionColumn.svelte
index 19b40950..feef8a28 100644
--- a/frontend/src/lib/components/TranscriptionColumn.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import * as m from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
-import { formatMCDate } from '$lib/utils/date.js';
+import { formatMCDate } from '$lib/shared/utils/date.js';
 import type { components } from '$lib/generated/api';
-import ContributorStack from './ContributorStack.svelte';
+import ContributorStack from '$lib/shared/primitives/ContributorStack.svelte';
 
 type TranscriptionQueueItemDTO = components['schemas']['TranscriptionQueueItemDTO'];
 
diff --git a/frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TranscriptionColumn.svelte.spec.ts
rename to frontend/src/lib/document/transcription/TranscriptionColumn.svelte.spec.ts
diff --git a/frontend/src/lib/components/TranscriptionEditView.svelte b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
similarity index 96%
rename from frontend/src/lib/components/TranscriptionEditView.svelte
rename to frontend/src/lib/document/transcription/TranscriptionEditView.svelte
index 64e97fef..b9aecafe 100644
--- a/frontend/src/lib/components/TranscriptionEditView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import TranscriptionBlock from './TranscriptionBlock.svelte';
-import OcrTrigger from './OcrTrigger.svelte';
-import TranscribeCoachEmptyState from './TranscribeCoachEmptyState.svelte';
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
-import { createBlockAutoSave } from '$lib/hooks/useBlockAutoSave.svelte';
-import { createBlockDragDrop } from '$lib/hooks/useBlockDragDrop.svelte';
+import OcrTrigger from '$lib/ocr/OcrTrigger.svelte';
+import TranscribeCoachEmptyState from '$lib/shared/help/TranscribeCoachEmptyState.svelte';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
+import { createBlockAutoSave } from '$lib/document/transcription/useBlockAutoSave.svelte';
+import { createBlockDragDrop } from '$lib/document/transcription/useBlockDragDrop.svelte';
 
 type Props = {
 	documentId: string;
diff --git a/frontend/src/lib/components/TranscriptionEditView.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte.spec.ts
similarity index 99%
rename from frontend/src/lib/components/TranscriptionEditView.svelte.spec.ts
rename to frontend/src/lib/document/transcription/TranscriptionEditView.svelte.spec.ts
index 39bf098c..701cb288 100644
--- a/frontend/src/lib/components/TranscriptionEditView.svelte.spec.ts
+++ b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import TranscriptionEditView from './TranscriptionEditView.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/TranscriptionPanelHeader.svelte b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
similarity index 97%
rename from frontend/src/lib/components/TranscriptionPanelHeader.svelte
rename to frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
index 6bf40a5d..a7c91784 100644
--- a/frontend/src/lib/components/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 './HelpPopover.svelte';
+import HelpPopover from '$lib/shared/primitives/HelpPopover.svelte';
 
 type Props = {
 	mode: 'read' | 'edit';
diff --git a/frontend/src/lib/components/TranscriptionPanelHeader.svelte.test.ts b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/components/TranscriptionPanelHeader.svelte.test.ts
rename to frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte.test.ts
diff --git a/frontend/src/lib/components/TranscriptionReadView.svelte b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
similarity index 95%
rename from frontend/src/lib/components/TranscriptionReadView.svelte
rename to frontend/src/lib/document/transcription/TranscriptionReadView.svelte
index c800037a..c6e82711 100644
--- a/frontend/src/lib/components/TranscriptionReadView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-import type { TranscriptionBlockData } from '$lib/types';
+import type { TranscriptionBlockData } from '$lib/shared/types';
 import type { components } from '$lib/generated/api';
-import { splitByMarkers } from '$lib/utils/transcriptionMarkers';
+import { splitByMarkers } from '$lib/document/transcription/transcriptionMarkers';
 import {
 	renderTranscriptionBody,
 	type SafeHtml,
 	PERSON_MENTION_SELECTOR
-} from '$lib/utils/mention';
-import { computeHoverCardPosition } from '$lib/utils/hoverCardPosition';
-import PersonHoverCard from './PersonHoverCard.svelte';
-import type { HoverData, LoadState } from '$lib/types/personHoverCard';
+} from '$lib/shared/discussion/mention';
+import { computeHoverCardPosition } from '$lib/shared/utils/hoverCardPosition';
+import PersonHoverCard from '$lib/person/PersonHoverCard.svelte';
+import type { HoverData, LoadState } from '$lib/person/personHoverCard';
 import { goto } from '$app/navigation';
 import { SvelteMap, SvelteSet } from 'svelte/reactivity';
 
diff --git a/frontend/src/lib/components/TranscriptionReadView.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/components/TranscriptionReadView.svelte.spec.ts
rename to frontend/src/lib/document/transcription/TranscriptionReadView.svelte.spec.ts
index fbd121c4..9d04319d 100644
--- a/frontend/src/lib/components/TranscriptionReadView.svelte.spec.ts
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.spec.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import TranscriptionReadView from './TranscriptionReadView.svelte';
-import type { TranscriptionBlockData } from '$lib/types';
+import type { TranscriptionBlockData } from '$lib/shared/types';
 
 const PERSON_ID = '11111111-0000-0000-0000-000000000001';
 
diff --git a/frontend/src/lib/components/TranscriptionReadView.svelte.test.ts b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.test.ts
similarity index 99%
rename from frontend/src/lib/components/TranscriptionReadView.svelte.test.ts
rename to frontend/src/lib/document/transcription/TranscriptionReadView.svelte.test.ts
index 31e62d47..ce9f2985 100644
--- a/frontend/src/lib/components/TranscriptionReadView.svelte.test.ts
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import TranscriptionReadView from './TranscriptionReadView.svelte';
-import type { TranscriptionBlockData } from '$lib/types';
+import type { TranscriptionBlockData } from '$lib/shared/types';
 
 const blocks: TranscriptionBlockData[] = [
 	{
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/blockConflictMerge.spec.ts b/frontend/src/lib/document/transcription/blockConflictMerge.spec.ts
similarity index 99%
rename from frontend/src/lib/utils/blockConflictMerge.spec.ts
rename to frontend/src/lib/document/transcription/blockConflictMerge.spec.ts
index e10b245d..8af389bd 100644
--- a/frontend/src/lib/utils/blockConflictMerge.spec.ts
+++ b/frontend/src/lib/document/transcription/blockConflictMerge.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { BlockConflictResolvedError, mergeBlockOnConflict } from './blockConflictMerge';
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
 
 const baseBlock: TranscriptionBlockData = {
 	id: 'b1',
diff --git a/frontend/src/lib/utils/blockConflictMerge.ts b/frontend/src/lib/document/transcription/blockConflictMerge.ts
similarity index 99%
rename from frontend/src/lib/utils/blockConflictMerge.ts
rename to frontend/src/lib/document/transcription/blockConflictMerge.ts
index 7077d6c9..ce0a5ca1 100644
--- a/frontend/src/lib/utils/blockConflictMerge.ts
+++ b/frontend/src/lib/document/transcription/blockConflictMerge.ts
@@ -1,4 +1,4 @@
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
 
 /**
  * Sentinel thrown by saveBlockWithConflictRetry after a 409 rename-mid-edit
diff --git a/frontend/src/lib/utils/saveBlockWithConflictRetry.spec.ts b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.spec.ts
similarity index 98%
rename from frontend/src/lib/utils/saveBlockWithConflictRetry.spec.ts
rename to frontend/src/lib/document/transcription/saveBlockWithConflictRetry.spec.ts
index cc808c7d..db7b7d6a 100644
--- a/frontend/src/lib/utils/saveBlockWithConflictRetry.spec.ts
+++ b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.spec.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import { saveBlockWithConflictRetry } from './saveBlockWithConflictRetry';
 import { BlockConflictResolvedError } from './blockConflictMerge';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 const DOC = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
 const BLK = 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb';
diff --git a/frontend/src/lib/utils/saveBlockWithConflictRetry.ts b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
similarity index 94%
rename from frontend/src/lib/utils/saveBlockWithConflictRetry.ts
rename to frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
index 4daeca50..9f4ad14b 100644
--- a/frontend/src/lib/utils/saveBlockWithConflictRetry.ts
+++ b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
@@ -1,5 +1,8 @@
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
-import { BlockConflictResolvedError, mergeBlockOnConflict } from '$lib/utils/blockConflictMerge';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
+import {
+	BlockConflictResolvedError,
+	mergeBlockOnConflict
+} from '$lib/document/transcription/blockConflictMerge';
 
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
diff --git a/frontend/src/lib/utils/transcriptionMarkers.spec.ts b/frontend/src/lib/document/transcription/transcriptionMarkers.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/transcriptionMarkers.spec.ts
rename to frontend/src/lib/document/transcription/transcriptionMarkers.spec.ts
diff --git a/frontend/src/lib/utils/transcriptionMarkers.ts b/frontend/src/lib/document/transcription/transcriptionMarkers.ts
similarity index 100%
rename from frontend/src/lib/utils/transcriptionMarkers.ts
rename to frontend/src/lib/document/transcription/transcriptionMarkers.ts
diff --git a/frontend/src/lib/hooks/__tests__/useBlockAutoSave.svelte.test.ts b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
similarity index 98%
rename from frontend/src/lib/hooks/__tests__/useBlockAutoSave.svelte.test.ts
rename to frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
index f6a87a8f..a77d3dcc 100644
--- a/frontend/src/lib/hooks/__tests__/useBlockAutoSave.svelte.test.ts
+++ b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
@@ -1,12 +1,12 @@
 import { describe, it, expect, vi, beforeEach, afterEach, type Mock } from 'vitest';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 const mockSaveFn =
 	vi.fn<(blockId: string, text: string, mentionedPersons: PersonMention[]) => Promise<void>>();
 
 const NO_MENTIONS: PersonMention[] = [];
 
-const { createBlockAutoSave } = await import('../useBlockAutoSave.svelte');
+const { createBlockAutoSave } = await import('./useBlockAutoSave.svelte');
 
 describe('createBlockAutoSave', () => {
 	beforeEach(() => {
diff --git a/frontend/src/lib/hooks/useBlockAutoSave.svelte.ts b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.ts
similarity index 98%
rename from frontend/src/lib/hooks/useBlockAutoSave.svelte.ts
rename to frontend/src/lib/document/transcription/useBlockAutoSave.svelte.ts
index 21de5442..4e538fbc 100644
--- a/frontend/src/lib/hooks/useBlockAutoSave.svelte.ts
+++ b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.ts
@@ -1,5 +1,5 @@
 import { SvelteMap } from 'svelte/reactivity';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 export type SaveState = 'idle' | 'saving' | 'saved' | 'fading' | 'error';
 
diff --git a/frontend/src/lib/hooks/__tests__/useBlockDragDrop.svelte.test.ts b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.test.ts
similarity index 97%
rename from frontend/src/lib/hooks/__tests__/useBlockDragDrop.svelte.test.ts
rename to frontend/src/lib/document/transcription/useBlockDragDrop.svelte.test.ts
index 3e4adaa2..2b756e4d 100644
--- a/frontend/src/lib/hooks/__tests__/useBlockDragDrop.svelte.test.ts
+++ b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from 'vitest';
-import { createBlockDragDrop } from '../useBlockDragDrop.svelte';
-import type { TranscriptionBlockData } from '$lib/types';
+import { createBlockDragDrop } from './useBlockDragDrop.svelte';
+import type { TranscriptionBlockData } from '$lib/shared/types';
 
 function makeBlock(id: string, sortOrder: number): TranscriptionBlockData {
 	return {
diff --git a/frontend/src/lib/hooks/useBlockDragDrop.svelte.ts b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.ts
similarity index 97%
rename from frontend/src/lib/hooks/useBlockDragDrop.svelte.ts
rename to frontend/src/lib/document/transcription/useBlockDragDrop.svelte.ts
index 176bd467..900c5d1c 100644
--- a/frontend/src/lib/hooks/useBlockDragDrop.svelte.ts
+++ b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.ts
@@ -1,4 +1,4 @@
-import type { TranscriptionBlockData } from '$lib/types';
+import type { TranscriptionBlockData } from '$lib/shared/types';
 
 type Options = {
 	getSortedBlocks: () => TranscriptionBlockData[];
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/components/PdfControls.svelte b/frontend/src/lib/document/viewer/PdfControls.svelte
similarity index 100%
rename from frontend/src/lib/components/PdfControls.svelte
rename to frontend/src/lib/document/viewer/PdfControls.svelte
diff --git a/frontend/src/lib/components/PdfControls.svelte.spec.ts b/frontend/src/lib/document/viewer/PdfControls.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PdfControls.svelte.spec.ts
rename to frontend/src/lib/document/viewer/PdfControls.svelte.spec.ts
diff --git a/frontend/src/lib/components/PdfViewer.svelte b/frontend/src/lib/document/viewer/PdfViewer.svelte
similarity index 96%
rename from frontend/src/lib/components/PdfViewer.svelte
rename to frontend/src/lib/document/viewer/PdfViewer.svelte
index 7642b197..5b23911f 100644
--- a/frontend/src/lib/components/PdfViewer.svelte
+++ b/frontend/src/lib/document/viewer/PdfViewer.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 import { onMount, setContext } from 'svelte';
-import { createPdfRenderer } from '$lib/hooks/usePdfRenderer.svelte';
+import { createPdfRenderer } from '$lib/document/viewer/usePdfRenderer.svelte';
 import PdfControls from './PdfControls.svelte';
-import AnnotationLayer from './AnnotationLayer.svelte';
-import type { Annotation } from '$lib/types';
+import AnnotationLayer from '$lib/document/annotation/AnnotationLayer.svelte';
+import type { Annotation } from '$lib/shared/types';
 import { m } from '$lib/paraglide/messages.js';
-import { parseBackendError, getErrorMessage } from '$lib/errors';
+import { parseBackendError, getErrorMessage } from '$lib/shared/errors';
 
 type DrawRect = { x: number; y: number; width: number; height: number; pageNumber: number };
 
diff --git a/frontend/src/lib/components/PdfViewer.svelte.spec.ts b/frontend/src/lib/document/viewer/PdfViewer.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PdfViewer.svelte.spec.ts
rename to frontend/src/lib/document/viewer/PdfViewer.svelte.spec.ts
diff --git a/frontend/src/lib/hooks/__tests__/useFileLoader.svelte.test.ts b/frontend/src/lib/document/viewer/useFileLoader.svelte.test.ts
similarity index 97%
rename from frontend/src/lib/hooks/__tests__/useFileLoader.svelte.test.ts
rename to frontend/src/lib/document/viewer/useFileLoader.svelte.test.ts
index 4dc4bec3..948dcbfa 100644
--- a/frontend/src/lib/hooks/__tests__/useFileLoader.svelte.test.ts
+++ b/frontend/src/lib/document/viewer/useFileLoader.svelte.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, afterEach } from 'vitest';
-import { createFileLoader } from '../useFileLoader.svelte';
+import { createFileLoader } from './useFileLoader.svelte';
 
 const FAKE_URL = 'blob:fake-url';
 
diff --git a/frontend/src/lib/hooks/useFileLoader.svelte.ts b/frontend/src/lib/document/viewer/useFileLoader.svelte.ts
similarity index 100%
rename from frontend/src/lib/hooks/useFileLoader.svelte.ts
rename to frontend/src/lib/document/viewer/useFileLoader.svelte.ts
diff --git a/frontend/src/lib/hooks/__tests__/usePdfRenderer.svelte.test.ts b/frontend/src/lib/document/viewer/usePdfRenderer.svelte.test.ts
similarity index 96%
rename from frontend/src/lib/hooks/__tests__/usePdfRenderer.svelte.test.ts
rename to frontend/src/lib/document/viewer/usePdfRenderer.svelte.test.ts
index d36b5c66..aa7a5509 100644
--- a/frontend/src/lib/hooks/__tests__/usePdfRenderer.svelte.test.ts
+++ b/frontend/src/lib/document/viewer/usePdfRenderer.svelte.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { createPdfRenderer } from '../usePdfRenderer.svelte';
+import { createPdfRenderer } from './usePdfRenderer.svelte';
 
 // Note: init() and loadDocument() require pdfjsLib (browser module).
 // These tests cover pure state logic only — bounds clamping and zoom limits.
diff --git a/frontend/src/lib/hooks/usePdfRenderer.svelte.ts b/frontend/src/lib/document/viewer/usePdfRenderer.svelte.ts
similarity index 100%
rename from frontend/src/lib/hooks/usePdfRenderer.svelte.ts
rename to frontend/src/lib/document/viewer/usePdfRenderer.svelte.ts
diff --git a/frontend/src/lib/components/GeschichteEditor.svelte b/frontend/src/lib/geschichte/GeschichteEditor.svelte
similarity index 98%
rename from frontend/src/lib/components/GeschichteEditor.svelte
rename to frontend/src/lib/geschichte/GeschichteEditor.svelte
index 70ff118b..1df78c03 100644
--- a/frontend/src/lib/components/GeschichteEditor.svelte
+++ b/frontend/src/lib/geschichte/GeschichteEditor.svelte
@@ -5,8 +5,8 @@ import { Editor } from '@tiptap/core';
 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 PersonMultiSelect from '$lib/person/PersonMultiSelect.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/GeschichteEditor.svelte.spec.ts b/frontend/src/lib/geschichte/GeschichteEditor.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/GeschichteEditor.svelte.spec.ts
rename to frontend/src/lib/geschichte/GeschichteEditor.svelte.spec.ts
diff --git a/frontend/src/lib/components/GeschichtenCard.svelte b/frontend/src/lib/geschichte/GeschichtenCard.svelte
similarity index 95%
rename from frontend/src/lib/components/GeschichtenCard.svelte
rename to frontend/src/lib/geschichte/GeschichtenCard.svelte
index e5d840f5..2fec7b39 100644
--- a/frontend/src/lib/components/GeschichtenCard.svelte
+++ b/frontend/src/lib/geschichte/GeschichtenCard.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
-import { plainExcerpt } from '$lib/utils/extractText';
-import { formatDate } from '$lib/utils/date';
+import { plainExcerpt } from '$lib/shared/utils/extractText';
+import { formatDate } from '$lib/shared/utils/date';
 
 type Geschichte = components['schemas']['Geschichte'];
 
diff --git a/frontend/src/lib/components/GeschichtenCard.svelte.spec.ts b/frontend/src/lib/geschichte/GeschichtenCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/GeschichtenCard.svelte.spec.ts
rename to frontend/src/lib/geschichte/GeschichtenCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/NotificationBell.svelte b/frontend/src/lib/notification/NotificationBell.svelte
similarity index 93%
rename from frontend/src/lib/components/NotificationBell.svelte
rename to frontend/src/lib/notification/NotificationBell.svelte
index a06d90e4..3648f95f 100644
--- a/frontend/src/lib/components/NotificationBell.svelte
+++ b/frontend/src/lib/notification/NotificationBell.svelte
@@ -2,9 +2,9 @@
 import { onMount, onDestroy } from 'svelte';
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
-import { notificationStore } from '$lib/stores/notifications.svelte';
-import { buildCommentHref } from '$lib/utils/commentDeepLink';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
+import { notificationStore } from '$lib/notification/notifications.svelte';
+import { buildCommentHref } from '$lib/shared/discussion/commentDeepLink';
 import NotificationDropdown from './NotificationDropdown.svelte';
 
 let open = $state(false);
diff --git a/frontend/src/lib/components/NotificationBell.svelte.spec.ts b/frontend/src/lib/notification/NotificationBell.svelte.spec.ts
similarity index 96%
rename from frontend/src/lib/components/NotificationBell.svelte.spec.ts
rename to frontend/src/lib/notification/NotificationBell.svelte.spec.ts
index 97f97580..e73de0f0 100644
--- a/frontend/src/lib/components/NotificationBell.svelte.spec.ts
+++ b/frontend/src/lib/notification/NotificationBell.svelte.spec.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, it, expect, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
-import type { NotificationItem } from '$lib/utils/notifications';
+import type { NotificationItem } from '$lib/notification/notifications';
 import NotificationBell from './NotificationBell.svelte';
 
 const gotoMock = vi.hoisted(() => vi.fn());
@@ -9,7 +9,7 @@ vi.mock('$app/navigation', () => ({ goto: gotoMock, beforeNavigate: vi.fn() }));
 const mockMarkRead = vi.hoisted(() => vi.fn().mockResolvedValue(undefined));
 const mockNotificationList = vi.hoisted((): { value: NotificationItem[] } => ({ value: [] }));
 
-vi.mock('$lib/stores/notifications.svelte', () => ({
+vi.mock('$lib/notification/notifications.svelte', () => ({
 	notificationStore: {
 		get notifications() {
 			return mockNotificationList.value;
diff --git a/frontend/src/lib/components/NotificationDropdown.svelte b/frontend/src/lib/notification/NotificationDropdown.svelte
similarity index 96%
rename from frontend/src/lib/components/NotificationDropdown.svelte
rename to frontend/src/lib/notification/NotificationDropdown.svelte
index 3b92c13d..c94f0a10 100644
--- a/frontend/src/lib/components/NotificationDropdown.svelte
+++ b/frontend/src/lib/notification/NotificationDropdown.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { relativeTime } from '$lib/utils/time';
-import type { NotificationItem } from '$lib/stores/notifications.svelte';
+import { relativeTime } from '$lib/shared/utils/time';
+import type { NotificationItem } from '$lib/notification/notifications.svelte';
 
 type Props = {
 	notifications: NotificationItem[];
diff --git a/frontend/src/lib/utils/notifications.spec.ts b/frontend/src/lib/notification/notifications.spec.ts
similarity index 96%
rename from frontend/src/lib/utils/notifications.spec.ts
rename to frontend/src/lib/notification/notifications.spec.ts
index 294ea0ac..2c599d2b 100644
--- a/frontend/src/lib/utils/notifications.spec.ts
+++ b/frontend/src/lib/notification/notifications.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { parseNotificationEvent } from '$lib/utils/notifications';
+import { parseNotificationEvent } from '$lib/notification/notifications';
 
 describe('parseNotificationEvent', () => {
 	const valid = {
diff --git a/frontend/src/lib/stores/notifications.svelte.spec.ts b/frontend/src/lib/notification/notifications.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/stores/notifications.svelte.spec.ts
rename to frontend/src/lib/notification/notifications.svelte.spec.ts
index bb2a0ca6..f4bb1ca0 100644
--- a/frontend/src/lib/stores/notifications.svelte.spec.ts
+++ b/frontend/src/lib/notification/notifications.svelte.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { NotificationItem } from '$lib/utils/notifications';
+import type { NotificationItem } from '$lib/notification/notifications';
 
 let lastEventSource: MockEventSource | null = null;
 let eventSourceCount = 0;
diff --git a/frontend/src/lib/stores/notifications.svelte.ts b/frontend/src/lib/notification/notifications.svelte.ts
similarity index 98%
rename from frontend/src/lib/stores/notifications.svelte.ts
rename to frontend/src/lib/notification/notifications.svelte.ts
index b2aa2b28..2ac49e4e 100644
--- a/frontend/src/lib/stores/notifications.svelte.ts
+++ b/frontend/src/lib/notification/notifications.svelte.ts
@@ -1,4 +1,4 @@
-import { type NotificationItem, parseNotificationEvent } from '$lib/utils/notifications';
+import { type NotificationItem, parseNotificationEvent } from '$lib/notification/notifications';
 
 export type { NotificationItem };
 
diff --git a/frontend/src/lib/utils/notifications.ts b/frontend/src/lib/notification/notifications.ts
similarity index 92%
rename from frontend/src/lib/utils/notifications.ts
rename to frontend/src/lib/notification/notifications.ts
index a4feb005..57784d8f 100644
--- a/frontend/src/lib/utils/notifications.ts
+++ b/frontend/src/lib/notification/notifications.ts
@@ -10,7 +10,7 @@ export type NotificationItem = {
 	documentTitle: string | null;
 };
 
-export { relativeTime } from '$lib/utils/time';
+export { relativeTime } from '$lib/shared/utils/time';
 
 export function parseNotificationEvent(raw: string): NotificationItem | null {
 	try {
diff --git a/frontend/src/lib/components/OcrProgress.svelte b/frontend/src/lib/ocr/OcrProgress.svelte
similarity index 100%
rename from frontend/src/lib/components/OcrProgress.svelte
rename to frontend/src/lib/ocr/OcrProgress.svelte
diff --git a/frontend/src/lib/components/OcrTrainingCard.svelte b/frontend/src/lib/ocr/OcrTrainingCard.svelte
similarity index 98%
rename from frontend/src/lib/components/OcrTrainingCard.svelte
rename to frontend/src/lib/ocr/OcrTrainingCard.svelte
index 77a62a94..3bb8eb6c 100644
--- a/frontend/src/lib/components/OcrTrainingCard.svelte
+++ b/frontend/src/lib/ocr/OcrTrainingCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import TrainingHistory from './TrainingHistory.svelte';
 import { m } from '$lib/paraglide/messages.js';
-import type { TrainingRun } from '$lib/types/training.js';
+import type { TrainingRun } from '$lib/ocr/training.js';
 
 interface TrainingInfo {
 	availableBlocks?: number;
diff --git a/frontend/src/lib/components/OcrTrainingCard.svelte.spec.ts b/frontend/src/lib/ocr/OcrTrainingCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/OcrTrainingCard.svelte.spec.ts
rename to frontend/src/lib/ocr/OcrTrainingCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/OcrTrigger.svelte b/frontend/src/lib/ocr/OcrTrigger.svelte
similarity index 94%
rename from frontend/src/lib/components/OcrTrigger.svelte
rename to frontend/src/lib/ocr/OcrTrigger.svelte
index e764263c..f361a4cf 100644
--- a/frontend/src/lib/components/OcrTrigger.svelte
+++ b/frontend/src/lib/ocr/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/SegmentationTrainingCard.svelte b/frontend/src/lib/ocr/SegmentationTrainingCard.svelte
similarity index 97%
rename from frontend/src/lib/components/SegmentationTrainingCard.svelte
rename to frontend/src/lib/ocr/SegmentationTrainingCard.svelte
index eba98409..cfd9c478 100644
--- a/frontend/src/lib/components/SegmentationTrainingCard.svelte
+++ b/frontend/src/lib/ocr/SegmentationTrainingCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import TrainingHistory from './TrainingHistory.svelte';
 import { m } from '$lib/paraglide/messages.js';
-import type { TrainingRun } from '$lib/types/training.js';
+import type { TrainingRun } from '$lib/ocr/training.js';
 
 interface TrainingInfo {
 	availableSegBlocks?: number;
diff --git a/frontend/src/lib/components/TrainingHistory.svelte b/frontend/src/lib/ocr/TrainingHistory.svelte
similarity index 98%
rename from frontend/src/lib/components/TrainingHistory.svelte
rename to frontend/src/lib/ocr/TrainingHistory.svelte
index 4e830c07..7c4dd4b4 100644
--- a/frontend/src/lib/components/TrainingHistory.svelte
+++ b/frontend/src/lib/ocr/TrainingHistory.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import type { TrainingRun } from '$lib/types/training.js';
+import type { TrainingRun } from '$lib/ocr/training.js';
 
 interface Props {
 	runs: TrainingRun[];
diff --git a/frontend/src/lib/components/TrainingHistory.svelte.spec.ts b/frontend/src/lib/ocr/TrainingHistory.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TrainingHistory.svelte.spec.ts
rename to frontend/src/lib/ocr/TrainingHistory.svelte.spec.ts
diff --git a/frontend/src/lib/types/training.ts b/frontend/src/lib/ocr/training.ts
similarity index 100%
rename from frontend/src/lib/types/training.ts
rename to frontend/src/lib/ocr/training.ts
diff --git a/frontend/src/lib/components/PersonChip.svelte b/frontend/src/lib/person/PersonChip.svelte
similarity index 97%
rename from frontend/src/lib/components/PersonChip.svelte
rename to frontend/src/lib/person/PersonChip.svelte
index 89dd502a..e9a535e8 100644
--- a/frontend/src/lib/components/PersonChip.svelte
+++ b/frontend/src/lib/person/PersonChip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { abbreviateName, getInitials, personAvatarColor } from '$lib/utils/personFormat';
+import { abbreviateName, getInitials, personAvatarColor } from '$lib/person/personFormat';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 
diff --git a/frontend/src/lib/components/PersonChipRow.svelte b/frontend/src/lib/person/PersonChipRow.svelte
similarity index 92%
rename from frontend/src/lib/components/PersonChipRow.svelte
rename to frontend/src/lib/person/PersonChipRow.svelte
index d292e22d..1deeee59 100644
--- a/frontend/src/lib/components/PersonChipRow.svelte
+++ b/frontend/src/lib/person/PersonChipRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import PersonChip from './PersonChip.svelte';
-import OverflowPillDisplay from './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/PersonHoverCard.svelte b/frontend/src/lib/person/PersonHoverCard.svelte
similarity index 97%
rename from frontend/src/lib/components/PersonHoverCard.svelte
rename to frontend/src/lib/person/PersonHoverCard.svelte
index 4eecd578..934bfd3e 100644
--- a/frontend/src/lib/components/PersonHoverCard.svelte
+++ b/frontend/src/lib/person/PersonHoverCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import { chipLabel, otherName } from '$lib/relationshipLabels';
+import { formatLifeDateRange } from '$lib/person/personLifeDates';
+import { chipLabel, otherName } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
-import type { LoadState } from '$lib/types/personHoverCard';
+import type { LoadState } from '$lib/person/personHoverCard';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
 
diff --git a/frontend/src/lib/components/PersonHoverCard.svelte.spec.ts b/frontend/src/lib/person/PersonHoverCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonHoverCard.svelte.spec.ts
rename to frontend/src/lib/person/PersonHoverCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonMultiSelect.svelte b/frontend/src/lib/person/PersonMultiSelect.svelte
similarity index 98%
rename from frontend/src/lib/components/PersonMultiSelect.svelte
rename to frontend/src/lib/person/PersonMultiSelect.svelte
index 6ff453c9..80a4e97b 100644
--- a/frontend/src/lib/components/PersonMultiSelect.svelte
+++ b/frontend/src/lib/person/PersonMultiSelect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import type { components } from '$lib/generated/api';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 type Person = components['schemas']['Person'];
 
 interface Props {
diff --git a/frontend/src/lib/components/PersonMultiSelect.svelte.spec.ts b/frontend/src/lib/person/PersonMultiSelect.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonMultiSelect.svelte.spec.ts
rename to frontend/src/lib/person/PersonMultiSelect.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonTypeBadge.svelte b/frontend/src/lib/person/PersonTypeBadge.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonTypeBadge.svelte
rename to frontend/src/lib/person/PersonTypeBadge.svelte
diff --git a/frontend/src/lib/components/PersonTypeSelector.svelte b/frontend/src/lib/person/PersonTypeSelector.svelte
similarity index 94%
rename from frontend/src/lib/components/PersonTypeSelector.svelte
rename to frontend/src/lib/person/PersonTypeSelector.svelte
index 1d4de750..d38f758b 100644
--- a/frontend/src/lib/components/PersonTypeSelector.svelte
+++ b/frontend/src/lib/person/PersonTypeSelector.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { untrack } from 'svelte';
-import { radioGroupNav } from '$lib/actions/radioGroupNav';
+import { radioGroupNav } from '$lib/shared/actions/radioGroupNav';
 import { m } from '$lib/paraglide/messages.js';
-import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person-validation';
+import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person/person-validation';
 
 let {
 	value = 'PERSON',
diff --git a/frontend/src/lib/components/PersonTypeSelector.svelte.spec.ts b/frontend/src/lib/person/PersonTypeSelector.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonTypeSelector.svelte.spec.ts
rename to frontend/src/lib/person/PersonTypeSelector.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonTypeahead.svelte b/frontend/src/lib/person/PersonTypeahead.svelte
similarity index 97%
rename from frontend/src/lib/components/PersonTypeahead.svelte
rename to frontend/src/lib/person/PersonTypeahead.svelte
index 55acd69e..dd3b25ea 100644
--- a/frontend/src/lib/components/PersonTypeahead.svelte
+++ b/frontend/src/lib/person/PersonTypeahead.svelte
@@ -2,9 +2,9 @@
 import { untrack } from 'svelte';
 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 { clickOutside } from '$lib/shared/actions/clickOutside';
+import { createTypeahead } from '$lib/shared/hooks/useTypeahead.svelte';
+import FieldLabelBadge from '$lib/document/FieldLabelBadge.svelte';
 type Person = components['schemas']['Person'];
 
 interface Props {
diff --git a/frontend/src/lib/components/PersonTypeahead.svelte.spec.ts b/frontend/src/lib/person/PersonTypeahead.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonTypeahead.svelte.spec.ts
rename to frontend/src/lib/person/PersonTypeahead.svelte.spec.ts
diff --git a/frontend/src/lib/components/StammbaumCard.svelte b/frontend/src/lib/person/genealogy/StammbaumCard.svelte
similarity index 96%
rename from frontend/src/lib/components/StammbaumCard.svelte
rename to frontend/src/lib/person/genealogy/StammbaumCard.svelte
index 49742ceb..02542f39 100644
--- a/frontend/src/lib/components/StammbaumCard.svelte
+++ b/frontend/src/lib/person/genealogy/StammbaumCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import RelationshipChip from '$lib/components/RelationshipChip.svelte';
-import AddRelationshipForm from '$lib/components/AddRelationshipForm.svelte';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
+import RelationshipChip from '$lib/person/relationship/RelationshipChip.svelte';
+import AddRelationshipForm from '$lib/person/relationship/AddRelationshipForm.svelte';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/lib/components/StammbaumCard.svelte.spec.ts b/frontend/src/lib/person/genealogy/StammbaumCard.svelte.spec.ts
similarity index 90%
rename from frontend/src/lib/components/StammbaumCard.svelte.spec.ts
rename to frontend/src/lib/person/genealogy/StammbaumCard.svelte.spec.ts
index da9271f9..f2f98284 100644
--- a/frontend/src/lib/components/StammbaumCard.svelte.spec.ts
+++ b/frontend/src/lib/person/genealogy/StammbaumCard.svelte.spec.ts
@@ -4,8 +4,8 @@ import { page } from 'vitest/browser';
 import StammbaumCard from './StammbaumCard.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/RelationshipChip.svelte', () => ({ default: () => null }));
-vi.mock('$lib/components/AddRelationshipForm.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/relationship/RelationshipChip.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/relationship/AddRelationshipForm.svelte', () => ({ default: () => null }));
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/StammbaumSidePanel.svelte b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
similarity index 96%
rename from frontend/src/lib/components/StammbaumSidePanel.svelte
rename to frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
index 5ec163ac..c243de71 100644
--- a/frontend/src/lib/components/StammbaumSidePanel.svelte
+++ b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
@@ -2,9 +2,9 @@
 import { onMount } from 'svelte';
 import { invalidateAll } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
-import AddRelationshipForm from '$lib/components/AddRelationshipForm.svelte';
-import type { RelFormData } from '$lib/components/AddRelationshipForm.svelte';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
+import AddRelationshipForm from '$lib/person/relationship/AddRelationshipForm.svelte';
+import type { RelFormData } from '$lib/person/relationship/AddRelationshipForm.svelte';
 import type { components } from '$lib/generated/api';
 
 type PersonNodeDTO = components['schemas']['PersonNodeDTO'];
diff --git a/frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts
similarity index 97%
rename from frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts
rename to frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts
index 1006367b..4dda616b 100644
--- a/frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts
+++ b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts
@@ -5,7 +5,7 @@ import StammbaumSidePanel from './StammbaumSidePanel.svelte';
 
 vi.mock('$app/navigation', () => ({ invalidateAll: vi.fn() }));
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({ default: () => null }));
 
 const makeNode = () => ({
 	id: 'person-1',
diff --git a/frontend/src/lib/components/StammbaumTree.svelte b/frontend/src/lib/person/genealogy/StammbaumTree.svelte
similarity index 100%
rename from frontend/src/lib/components/StammbaumTree.svelte
rename to frontend/src/lib/person/genealogy/StammbaumTree.svelte
diff --git a/frontend/src/lib/components/StammbaumTree.svelte.test.ts b/frontend/src/lib/person/genealogy/StammbaumTree.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/components/StammbaumTree.svelte.test.ts
rename to frontend/src/lib/person/genealogy/StammbaumTree.svelte.test.ts
diff --git a/frontend/src/lib/person-validation.test.ts b/frontend/src/lib/person/person-validation.test.ts
similarity index 100%
rename from frontend/src/lib/person-validation.test.ts
rename to frontend/src/lib/person/person-validation.test.ts
diff --git a/frontend/src/lib/person-validation.ts b/frontend/src/lib/person/person-validation.ts
similarity index 100%
rename from frontend/src/lib/person-validation.ts
rename to frontend/src/lib/person/person-validation.ts
diff --git a/frontend/src/lib/utils/personFormat.spec.ts b/frontend/src/lib/person/personFormat.spec.ts
similarity index 99%
rename from frontend/src/lib/utils/personFormat.spec.ts
rename to frontend/src/lib/person/personFormat.spec.ts
index 6a398c96..5e727ae3 100644
--- a/frontend/src/lib/utils/personFormat.spec.ts
+++ b/frontend/src/lib/person/personFormat.spec.ts
@@ -7,7 +7,7 @@ import {
 	statusDotClass,
 	statusLabel
 } from './personFormat';
-import { formatDate } from './date';
+import { formatDate } from '$lib/shared/utils/date';
 
 // ─── getInitials ─────────────────────────────────────────────────────────────
 
diff --git a/frontend/src/lib/utils/personFormat.ts b/frontend/src/lib/person/personFormat.ts
similarity index 95%
rename from frontend/src/lib/utils/personFormat.ts
rename to frontend/src/lib/person/personFormat.ts
index 86fd7ad7..9a538d26 100644
--- a/frontend/src/lib/utils/personFormat.ts
+++ b/frontend/src/lib/person/personFormat.ts
@@ -1,5 +1,5 @@
-import { formatDocumentStatus } from './documentStatusLabel';
-import { formatDate } from './date';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
+import { formatDate } from '$lib/shared/utils/date';
 
 type Person = { firstName?: string | null; lastName: string; displayName: string };
 type DocumentStatus = 'PLACEHOLDER' | 'UPLOADED' | 'TRANSCRIBED' | 'REVIEWED' | 'ARCHIVED';
diff --git a/frontend/src/lib/types/personHoverCard.ts b/frontend/src/lib/person/personHoverCard.ts
similarity index 100%
rename from frontend/src/lib/types/personHoverCard.ts
rename to frontend/src/lib/person/personHoverCard.ts
diff --git a/frontend/src/lib/utils/personLifeDates.spec.ts b/frontend/src/lib/person/personLifeDates.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/personLifeDates.spec.ts
rename to frontend/src/lib/person/personLifeDates.spec.ts
diff --git a/frontend/src/lib/utils/personLifeDates.ts b/frontend/src/lib/person/personLifeDates.ts
similarity index 100%
rename from frontend/src/lib/utils/personLifeDates.ts
rename to frontend/src/lib/person/personLifeDates.ts
diff --git a/frontend/src/lib/components/AddRelationshipForm.svelte b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte
similarity index 98%
rename from frontend/src/lib/components/AddRelationshipForm.svelte
rename to frontend/src/lib/person/relationship/AddRelationshipForm.svelte
index 7c5ee2e4..07fe0e47 100644
--- a/frontend/src/lib/components/AddRelationshipForm.svelte
+++ b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte.spec.ts
similarity index 97%
rename from frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts
rename to frontend/src/lib/person/relationship/AddRelationshipForm.svelte.spec.ts
index f542d7de..da9be13d 100644
--- a/frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts
+++ b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte.spec.ts
@@ -4,7 +4,7 @@ import { page } from 'vitest/browser';
 import AddRelationshipForm from './AddRelationshipForm.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({ default: () => null }));
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/RelationshipChip.svelte b/frontend/src/lib/person/relationship/RelationshipChip.svelte
similarity index 100%
rename from frontend/src/lib/components/RelationshipChip.svelte
rename to frontend/src/lib/person/relationship/RelationshipChip.svelte
diff --git a/frontend/src/lib/components/RelationshipChip.svelte.spec.ts b/frontend/src/lib/person/relationship/RelationshipChip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/RelationshipChip.svelte.spec.ts
rename to frontend/src/lib/person/relationship/RelationshipChip.svelte.spec.ts
diff --git a/frontend/src/lib/components/RelationshipPill.svelte b/frontend/src/lib/person/relationship/RelationshipPill.svelte
similarity index 100%
rename from frontend/src/lib/components/RelationshipPill.svelte
rename to frontend/src/lib/person/relationship/RelationshipPill.svelte
diff --git a/frontend/src/lib/relationshipLabels.test.ts b/frontend/src/lib/person/relationshipLabels.test.ts
similarity index 100%
rename from frontend/src/lib/relationshipLabels.test.ts
rename to frontend/src/lib/person/relationshipLabels.test.ts
diff --git a/frontend/src/lib/relationshipLabels.ts b/frontend/src/lib/person/relationshipLabels.ts
similarity index 100%
rename from frontend/src/lib/relationshipLabels.ts
rename to frontend/src/lib/person/relationshipLabels.ts
diff --git a/frontend/src/lib/actions/clickOutside.svelte.spec.ts b/frontend/src/lib/shared/actions/clickOutside.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/actions/clickOutside.svelte.spec.ts
rename to frontend/src/lib/shared/actions/clickOutside.svelte.spec.ts
diff --git a/frontend/src/lib/actions/clickOutside.ts b/frontend/src/lib/shared/actions/clickOutside.ts
similarity index 100%
rename from frontend/src/lib/actions/clickOutside.ts
rename to frontend/src/lib/shared/actions/clickOutside.ts
diff --git a/frontend/src/lib/actions/radioGroupNav.svelte.spec.ts b/frontend/src/lib/shared/actions/radioGroupNav.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/actions/radioGroupNav.svelte.spec.ts
rename to frontend/src/lib/shared/actions/radioGroupNav.svelte.spec.ts
diff --git a/frontend/src/lib/actions/radioGroupNav.ts b/frontend/src/lib/shared/actions/radioGroupNav.ts
similarity index 100%
rename from frontend/src/lib/actions/radioGroupNav.ts
rename to frontend/src/lib/shared/actions/radioGroupNav.ts
diff --git a/frontend/src/lib/api.server.ts b/frontend/src/lib/shared/api.server.ts
similarity index 100%
rename from frontend/src/lib/api.server.ts
rename to frontend/src/lib/shared/api.server.ts
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 83%
rename from frontend/src/lib/components/MissionControlStrip.svelte
rename to frontend/src/lib/shared/dashboard/MissionControlStrip.svelte
index 2a026877..e2dd6402 100644
--- a/frontend/src/lib/components/MissionControlStrip.svelte
+++ b/frontend/src/lib/shared/dashboard/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 TranscriptionColumn from './TranscriptionColumn.svelte';
-import ReadyColumn from './ReadyColumn.svelte';
+import SegmentationColumn from '$lib/document/SegmentationColumn.svelte';
+import TranscriptionColumn from '$lib/document/transcription/TranscriptionColumn.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/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 92%
rename from frontend/src/lib/components/CommentMessage.svelte
rename to frontend/src/lib/shared/discussion/CommentMessage.svelte
index f66c508c..b0b22017 100644
--- a/frontend/src/lib/components/CommentMessage.svelte
+++ b/frontend/src/lib/shared/discussion/CommentMessage.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import type { FlatMessage } from '$lib/types';
-import { extractQuote } from '$lib/utils/comment';
-import { getInitials } from '$lib/utils/personFormat';
-import { relativeTime } from '$lib/utils/time';
-import { renderBody } from '$lib/utils/mention';
+import type { FlatMessage } from '$lib/shared/types';
+import { extractQuote } from '$lib/shared/discussion/comment';
+import { getInitials } from '$lib/person/personFormat';
+import { relativeTime } from '$lib/shared/utils/time';
+import { renderBody } from '$lib/shared/discussion/mention';
 
 type Props = {
 	message: FlatMessage;
diff --git a/frontend/src/lib/components/CommentMessage.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/components/CommentMessage.svelte.spec.ts
rename to frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
index c00c272a..d0f85fda 100644
--- a/frontend/src/lib/components/CommentMessage.svelte.spec.ts
+++ b/frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page, userEvent } from 'vitest/browser';
 import CommentMessage from './CommentMessage.svelte';
-import type { FlatMessage } from '$lib/types';
+import type { FlatMessage } from '$lib/shared/types';
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/CommentThread.svelte b/frontend/src/lib/shared/discussion/CommentThread.svelte
similarity index 94%
rename from frontend/src/lib/components/CommentThread.svelte
rename to frontend/src/lib/shared/discussion/CommentThread.svelte
index f943c671..bdd9c3c9 100644
--- a/frontend/src/lib/components/CommentThread.svelte
+++ b/frontend/src/lib/shared/discussion/CommentThread.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { onMount, untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import type { Comment, FlatMessage } from '$lib/types';
-import MentionEditor from '$lib/components/MentionEditor.svelte';
-import CommentMessage from '$lib/components/CommentMessage.svelte';
-import { extractContent } from '$lib/utils/mention';
+import type { Comment, FlatMessage, MentionDTO } from '$lib/shared/types';
+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;
 	annotationId?: string | null;
diff --git a/frontend/src/lib/components/CommentThread.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
similarity index 97%
rename from frontend/src/lib/components/CommentThread.svelte.spec.ts
rename to frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
index a444a7ce..16996980 100644
--- a/frontend/src/lib/components/CommentThread.svelte.spec.ts
+++ b/frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import CommentThread from './CommentThread.svelte';
-import type { Comment } from '$lib/types';
+import type { Comment } from '$lib/shared/types';
 
 afterEach(() => {
 	cleanup();
diff --git a/frontend/src/lib/components/MentionDropdown.svelte b/frontend/src/lib/shared/discussion/MentionDropdown.svelte
similarity index 98%
rename from frontend/src/lib/components/MentionDropdown.svelte
rename to frontend/src/lib/shared/discussion/MentionDropdown.svelte
index 6a95b233..0230564e 100644
--- a/frontend/src/lib/components/MentionDropdown.svelte
+++ b/frontend/src/lib/shared/discussion/MentionDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { components } from '$lib/generated/api';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
+import { formatLifeDateRange } from '$lib/person/personLifeDates';
 import { m } from '$lib/paraglide/messages.js';
 
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/components/MentionEditor.svelte b/frontend/src/lib/shared/discussion/MentionEditor.svelte
similarity index 97%
rename from frontend/src/lib/components/MentionEditor.svelte
rename to frontend/src/lib/shared/discussion/MentionEditor.svelte
index 52b1ac74..544657a4 100644
--- a/frontend/src/lib/components/MentionEditor.svelte
+++ b/frontend/src/lib/shared/discussion/MentionEditor.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onDestroy, tick } from 'svelte';
-import { detectMention } from '$lib/utils/mention';
-import type { MentionDTO } from '$lib/types';
+import { detectMention } from '$lib/shared/discussion/mention';
+import type { MentionDTO } from '$lib/shared/types';
 import { m } from '$lib/paraglide/messages.js';
 
 type Props = {
diff --git a/frontend/src/lib/components/PersonMentionEditor.svelte b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
similarity index 98%
rename from frontend/src/lib/components/PersonMentionEditor.svelte
rename to frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
index aa2643b4..6c7e0941 100644
--- a/frontend/src/lib/components/PersonMentionEditor.svelte
+++ b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
@@ -5,8 +5,8 @@ import StarterKit from '@tiptap/starter-kit';
 import { Mention } from '@tiptap/extension-mention';
 import { m } from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
-import type { PersonMention } from '$lib/types';
-import { deserialize, serialize } from '$lib/utils/mentionSerializer';
+import type { PersonMention } from '$lib/shared/types';
+import { deserialize, serialize } from '$lib/shared/discussion/mentionSerializer';
 import MentionDropdown from './MentionDropdown.svelte';
 
 type Person = components['schemas']['Person'];
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/utils/comment.spec.ts b/frontend/src/lib/shared/discussion/comment.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/comment.spec.ts
rename to frontend/src/lib/shared/discussion/comment.spec.ts
diff --git a/frontend/src/lib/utils/comment.ts b/frontend/src/lib/shared/discussion/comment.ts
similarity index 100%
rename from frontend/src/lib/utils/comment.ts
rename to frontend/src/lib/shared/discussion/comment.ts
diff --git a/frontend/src/lib/utils/commentDeepLink.spec.ts b/frontend/src/lib/shared/discussion/commentDeepLink.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/commentDeepLink.spec.ts
rename to frontend/src/lib/shared/discussion/commentDeepLink.spec.ts
diff --git a/frontend/src/lib/utils/commentDeepLink.ts b/frontend/src/lib/shared/discussion/commentDeepLink.ts
similarity index 100%
rename from frontend/src/lib/utils/commentDeepLink.ts
rename to frontend/src/lib/shared/discussion/commentDeepLink.ts
diff --git a/frontend/src/lib/utils/mention.spec.ts b/frontend/src/lib/shared/discussion/mention.spec.ts
similarity index 99%
rename from frontend/src/lib/utils/mention.spec.ts
rename to frontend/src/lib/shared/discussion/mention.spec.ts
index 0323bf20..f063ab3b 100644
--- a/frontend/src/lib/utils/mention.spec.ts
+++ b/frontend/src/lib/shared/discussion/mention.spec.ts
@@ -6,7 +6,7 @@ import {
 	renderBody,
 	renderTranscriptionBody
 } from './mention';
-import type { MentionDTO, PersonMention } from '$lib/types';
+import type { MentionDTO, PersonMention } from '$lib/shared/types';
 
 // ─── escapeHtml ───────────────────────────────────────────────────────────────
 
diff --git a/frontend/src/lib/utils/mention.ts b/frontend/src/lib/shared/discussion/mention.ts
similarity index 98%
rename from frontend/src/lib/utils/mention.ts
rename to frontend/src/lib/shared/discussion/mention.ts
index 27451c4d..e6d57906 100644
--- a/frontend/src/lib/utils/mention.ts
+++ b/frontend/src/lib/shared/discussion/mention.ts
@@ -1,4 +1,4 @@
-import type { MentionDTO, PersonMention } from '$lib/types';
+import type { MentionDTO, PersonMention } from '$lib/shared/types';
 
 /**
  * Single-source CSS selector for rendered person-mention anchors. Used by:
diff --git a/frontend/src/lib/utils/mentionSerializer.spec.ts b/frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
similarity index 99%
rename from frontend/src/lib/utils/mentionSerializer.spec.ts
rename to frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
index 19b4c4a2..8c07241e 100644
--- a/frontend/src/lib/utils/mentionSerializer.spec.ts
+++ b/frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { deserialize, serialize } from './mentionSerializer';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 // ─── deserialize ─────────────────────────────────────────────────────────────
 
diff --git a/frontend/src/lib/utils/mentionSerializer.ts b/frontend/src/lib/shared/discussion/mentionSerializer.ts
similarity index 98%
rename from frontend/src/lib/utils/mentionSerializer.ts
rename to frontend/src/lib/shared/discussion/mentionSerializer.ts
index b6213f25..34648b8d 100644
--- a/frontend/src/lib/utils/mentionSerializer.ts
+++ b/frontend/src/lib/shared/discussion/mentionSerializer.ts
@@ -1,5 +1,5 @@
 import type { JSONContent } from '@tiptap/core';
-import type { PersonMention } from '$lib/types';
+import type { PersonMention } from '$lib/shared/types';
 
 /**
  * Converts stored block text + sidecar into a Tiptap ProseMirror document.
diff --git a/frontend/src/lib/errors.ts b/frontend/src/lib/shared/errors.ts
similarity index 100%
rename from frontend/src/lib/errors.ts
rename to frontend/src/lib/shared/errors.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/hooks/__tests__/useTypeahead.svelte.test.ts b/frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
similarity index 97%
rename from frontend/src/lib/hooks/__tests__/useTypeahead.svelte.test.ts
rename to frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
index 3de2a66d..e2983188 100644
--- a/frontend/src/lib/hooks/__tests__/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/hooks/useTypeahead.svelte.ts b/frontend/src/lib/shared/hooks/useTypeahead.svelte.ts
similarity index 100%
rename from frontend/src/lib/hooks/useTypeahead.svelte.ts
rename to frontend/src/lib/shared/hooks/useTypeahead.svelte.ts
diff --git a/frontend/src/lib/hooks/__tests__/useUnsavedWarning.svelte.test.ts b/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
similarity index 97%
rename from frontend/src/lib/hooks/__tests__/useUnsavedWarning.svelte.test.ts
rename to frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
index 9225a956..d85dc4c3 100644
--- a/frontend/src/lib/hooks/__tests__/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/hooks/useUnsavedWarning.svelte.ts b/frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.ts
similarity index 100%
rename from frontend/src/lib/hooks/useUnsavedWarning.svelte.ts
rename to frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.ts
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 95%
rename from frontend/src/lib/components/ConfirmDialog.svelte
rename to frontend/src/lib/shared/primitives/ConfirmDialog.svelte
index eafea0da..1fb1abd5 100644
--- a/frontend/src/lib/components/ConfirmDialog.svelte
+++ b/frontend/src/lib/shared/primitives/ConfirmDialog.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 import { m } from '$lib/paraglide/messages.js';
 
 // Context must already be set by the parent layout via provideConfirmService().
diff --git a/frontend/src/lib/components/ConfirmDialog.svelte.spec.ts b/frontend/src/lib/shared/primitives/ConfirmDialog.svelte.spec.ts
similarity index 98%
rename from frontend/src/lib/components/ConfirmDialog.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/ConfirmDialog.svelte.spec.ts
index 9868a06d..6ed874d7 100644
--- a/frontend/src/lib/components/ConfirmDialog.svelte.spec.ts
+++ b/frontend/src/lib/shared/primitives/ConfirmDialog.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import ConfirmDialog from './ConfirmDialog.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 afterEach(cleanup);
 
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 98%
rename from frontend/src/lib/components/DateInput.svelte
rename to frontend/src/lib/shared/primitives/DateInput.svelte
index 2ee7acc4..08fed63a 100644
--- a/frontend/src/lib/components/DateInput.svelte
+++ b/frontend/src/lib/shared/primitives/DateInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { isoToGerman, handleGermanDateInput, germanToIso } from '$lib/utils/date';
+import { isoToGerman, handleGermanDateInput, germanToIso } from '$lib/shared/utils/date';
 import { m } from '$lib/paraglide/messages.js';
 
 interface Props {
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/HelpPopover.svelte b/frontend/src/lib/shared/primitives/HelpPopover.svelte
similarity index 100%
rename from frontend/src/lib/components/HelpPopover.svelte
rename to frontend/src/lib/shared/primitives/HelpPopover.svelte
diff --git a/frontend/src/lib/components/HelpPopover.svelte.spec.ts b/frontend/src/lib/shared/primitives/HelpPopover.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/HelpPopover.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/HelpPopover.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 96%
rename from frontend/src/lib/components/OverflowPillButton.svelte
rename to frontend/src/lib/shared/primitives/OverflowPillButton.svelte
index 3661b5c4..7795c0f2 100644
--- a/frontend/src/lib/components/OverflowPillButton.svelte
+++ b/frontend/src/lib/shared/primitives/OverflowPillButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { tick } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 
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/relativeTime.spec.ts b/frontend/src/lib/shared/relativeTime.spec.ts
similarity index 100%
rename from frontend/src/lib/relativeTime.spec.ts
rename to frontend/src/lib/shared/relativeTime.spec.ts
diff --git a/frontend/src/lib/relativeTime.ts b/frontend/src/lib/shared/relativeTime.ts
similarity index 100%
rename from frontend/src/lib/relativeTime.ts
rename to frontend/src/lib/shared/relativeTime.ts
diff --git a/frontend/src/lib/server/locale.spec.ts b/frontend/src/lib/shared/server/locale.spec.ts
similarity index 100%
rename from frontend/src/lib/server/locale.spec.ts
rename to frontend/src/lib/shared/server/locale.spec.ts
diff --git a/frontend/src/lib/server/locale.ts b/frontend/src/lib/shared/server/locale.ts
similarity index 100%
rename from frontend/src/lib/server/locale.ts
rename to frontend/src/lib/shared/server/locale.ts
diff --git a/frontend/src/lib/services/confirm.svelte.test.ts b/frontend/src/lib/shared/services/confirm.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/services/confirm.svelte.test.ts
rename to frontend/src/lib/shared/services/confirm.svelte.test.ts
diff --git a/frontend/src/lib/services/confirm.svelte.ts b/frontend/src/lib/shared/services/confirm.svelte.ts
similarity index 97%
rename from frontend/src/lib/services/confirm.svelte.ts
rename to frontend/src/lib/shared/services/confirm.svelte.ts
index e5c320ec..1fb26baa 100644
--- a/frontend/src/lib/services/confirm.svelte.ts
+++ b/frontend/src/lib/shared/services/confirm.svelte.ts
@@ -8,7 +8,7 @@
  *
  * ## Usage in event handlers
  * ```typescript
- * import { getConfirmService } from '$lib/services/confirm.svelte.js';
+ * import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
  * const { confirm } = getConfirmService();
  *
  * async function handleDelete() {
diff --git a/frontend/src/lib/services/confirm.test-host.svelte b/frontend/src/lib/shared/services/confirm.test-host.svelte
similarity index 78%
rename from frontend/src/lib/services/confirm.test-host.svelte
rename to frontend/src/lib/shared/services/confirm.test-host.svelte
index 0d6a8406..249033ec 100644
--- a/frontend/src/lib/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/lib/types.ts b/frontend/src/lib/shared/types.ts
similarity index 100%
rename from frontend/src/lib/types.ts
rename to frontend/src/lib/shared/types.ts
diff --git a/frontend/src/lib/utils.spec.ts b/frontend/src/lib/shared/utils.spec.ts
similarity index 100%
rename from frontend/src/lib/utils.spec.ts
rename to frontend/src/lib/shared/utils.spec.ts
diff --git a/frontend/src/lib/shared/utils.ts b/frontend/src/lib/shared/utils.ts
new file mode 100644
index 00000000..490b94d8
--- /dev/null
+++ b/frontend/src/lib/shared/utils.ts
@@ -0,0 +1 @@
+export { isoToGerman, germanToIso } from '$lib/shared/utils/date';
diff --git a/frontend/src/lib/utils/date-buckets.spec.ts b/frontend/src/lib/shared/utils/date-buckets.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/date-buckets.spec.ts
rename to frontend/src/lib/shared/utils/date-buckets.spec.ts
diff --git a/frontend/src/lib/utils/date-buckets.ts b/frontend/src/lib/shared/utils/date-buckets.ts
similarity index 100%
rename from frontend/src/lib/utils/date-buckets.ts
rename to frontend/src/lib/shared/utils/date-buckets.ts
diff --git a/frontend/src/lib/utils/date.spec.ts b/frontend/src/lib/shared/utils/date.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/date.spec.ts
rename to frontend/src/lib/shared/utils/date.spec.ts
diff --git a/frontend/src/lib/utils/date.ts b/frontend/src/lib/shared/utils/date.ts
similarity index 100%
rename from frontend/src/lib/utils/date.ts
rename to frontend/src/lib/shared/utils/date.ts
diff --git a/frontend/src/lib/utils/debounce.spec.ts b/frontend/src/lib/shared/utils/debounce.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/debounce.spec.ts
rename to frontend/src/lib/shared/utils/debounce.spec.ts
diff --git a/frontend/src/lib/utils/debounce.ts b/frontend/src/lib/shared/utils/debounce.ts
similarity index 100%
rename from frontend/src/lib/utils/debounce.ts
rename to frontend/src/lib/shared/utils/debounce.ts
diff --git a/frontend/src/lib/utils/deepLinkScroll.spec.ts b/frontend/src/lib/shared/utils/deepLinkScroll.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/deepLinkScroll.spec.ts
rename to frontend/src/lib/shared/utils/deepLinkScroll.spec.ts
diff --git a/frontend/src/lib/utils/deepLinkScroll.ts b/frontend/src/lib/shared/utils/deepLinkScroll.ts
similarity index 100%
rename from frontend/src/lib/utils/deepLinkScroll.ts
rename to frontend/src/lib/shared/utils/deepLinkScroll.ts
diff --git a/frontend/src/lib/utils/extractText.spec.ts b/frontend/src/lib/shared/utils/extractText.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/extractText.spec.ts
rename to frontend/src/lib/shared/utils/extractText.spec.ts
diff --git a/frontend/src/lib/utils/extractText.ts b/frontend/src/lib/shared/utils/extractText.ts
similarity index 100%
rename from frontend/src/lib/utils/extractText.ts
rename to frontend/src/lib/shared/utils/extractText.ts
diff --git a/frontend/src/lib/utils/hoverCardPosition.spec.ts b/frontend/src/lib/shared/utils/hoverCardPosition.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/hoverCardPosition.spec.ts
rename to frontend/src/lib/shared/utils/hoverCardPosition.spec.ts
diff --git a/frontend/src/lib/utils/hoverCardPosition.ts b/frontend/src/lib/shared/utils/hoverCardPosition.ts
similarity index 100%
rename from frontend/src/lib/utils/hoverCardPosition.ts
rename to frontend/src/lib/shared/utils/hoverCardPosition.ts
diff --git a/frontend/src/lib/utils/requiredFields.test.ts b/frontend/src/lib/shared/utils/requiredFields.test.ts
similarity index 100%
rename from frontend/src/lib/utils/requiredFields.test.ts
rename to frontend/src/lib/shared/utils/requiredFields.test.ts
diff --git a/frontend/src/lib/utils/requiredFields.ts b/frontend/src/lib/shared/utils/requiredFields.ts
similarity index 100%
rename from frontend/src/lib/utils/requiredFields.ts
rename to frontend/src/lib/shared/utils/requiredFields.ts
diff --git a/frontend/src/lib/utils/sanitize.spec.ts b/frontend/src/lib/shared/utils/sanitize.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/sanitize.spec.ts
rename to frontend/src/lib/shared/utils/sanitize.spec.ts
diff --git a/frontend/src/lib/utils/sanitize.ts b/frontend/src/lib/shared/utils/sanitize.ts
similarity index 100%
rename from frontend/src/lib/utils/sanitize.ts
rename to frontend/src/lib/shared/utils/sanitize.ts
diff --git a/frontend/src/lib/utils/sort.spec.ts b/frontend/src/lib/shared/utils/sort.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/sort.spec.ts
rename to frontend/src/lib/shared/utils/sort.spec.ts
diff --git a/frontend/src/lib/utils/sort.ts b/frontend/src/lib/shared/utils/sort.ts
similarity index 100%
rename from frontend/src/lib/utils/sort.ts
rename to frontend/src/lib/shared/utils/sort.ts
diff --git a/frontend/src/lib/utils/time.spec.ts b/frontend/src/lib/shared/utils/time.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/time.spec.ts
rename to frontend/src/lib/shared/utils/time.spec.ts
diff --git a/frontend/src/lib/utils/time.ts b/frontend/src/lib/shared/utils/time.ts
similarity index 100%
rename from frontend/src/lib/utils/time.ts
rename to frontend/src/lib/shared/utils/time.ts
diff --git a/frontend/src/lib/components/TagChipList.svelte b/frontend/src/lib/tag/TagChipList.svelte
similarity index 100%
rename from frontend/src/lib/components/TagChipList.svelte
rename to frontend/src/lib/tag/TagChipList.svelte
diff --git a/frontend/src/lib/components/TagChipList.svelte.spec.ts b/frontend/src/lib/tag/TagChipList.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagChipList.svelte.spec.ts
rename to frontend/src/lib/tag/TagChipList.svelte.spec.ts
diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/tag/TagInput.svelte
similarity index 99%
rename from frontend/src/lib/components/TagInput.svelte
rename to frontend/src/lib/tag/TagInput.svelte
index 0442869c..82669b80 100644
--- a/frontend/src/lib/components/TagInput.svelte
+++ b/frontend/src/lib/tag/TagInput.svelte
@@ -2,7 +2,7 @@
 import { untrack } from 'svelte';
 import { SvelteMap } from 'svelte/reactivity';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 
 export type Tag = { id?: string; name: string; color?: string; parentId?: string };
 
diff --git a/frontend/src/lib/components/TagInput.svelte.spec.ts b/frontend/src/lib/tag/TagInput.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagInput.svelte.spec.ts
rename to frontend/src/lib/tag/TagInput.svelte.spec.ts
diff --git a/frontend/src/lib/components/TagParentPicker.svelte b/frontend/src/lib/tag/TagParentPicker.svelte
similarity index 97%
rename from frontend/src/lib/components/TagParentPicker.svelte
rename to frontend/src/lib/tag/TagParentPicker.svelte
index 152fb4b2..61472485 100644
--- a/frontend/src/lib/components/TagParentPicker.svelte
+++ b/frontend/src/lib/tag/TagParentPicker.svelte
@@ -2,8 +2,8 @@
 import { untrack } from 'svelte';
 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 { clickOutside } from '$lib/shared/actions/clickOutside';
+import { createTypeahead } from '$lib/shared/hooks/useTypeahead.svelte';
 
 type Tag = components['schemas']['Tag'];
 
diff --git a/frontend/src/lib/components/TagParentPicker.svelte.spec.ts b/frontend/src/lib/tag/TagParentPicker.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagParentPicker.svelte.spec.ts
rename to frontend/src/lib/tag/TagParentPicker.svelte.spec.ts
diff --git a/frontend/src/lib/components/user/UserGroupsSection.svelte b/frontend/src/lib/user/UserGroupsSection.svelte
similarity index 100%
rename from frontend/src/lib/components/user/UserGroupsSection.svelte
rename to frontend/src/lib/user/UserGroupsSection.svelte
diff --git a/frontend/src/lib/components/user/UserPasswordSection.svelte b/frontend/src/lib/user/UserPasswordSection.svelte
similarity index 100%
rename from frontend/src/lib/components/user/UserPasswordSection.svelte
rename to frontend/src/lib/user/UserPasswordSection.svelte
diff --git a/frontend/src/lib/components/user/UserProfileSection.svelte b/frontend/src/lib/user/UserProfileSection.svelte
similarity index 97%
rename from frontend/src/lib/components/user/UserProfileSection.svelte
rename to frontend/src/lib/user/UserProfileSection.svelte
index 1efd502a..dea8a9f3 100644
--- a/frontend/src/lib/components/user/UserProfileSection.svelte
+++ b/frontend/src/lib/user/UserProfileSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { untrack } from 'svelte';
-import { isoToGerman, handleGermanDateInput } from '$lib/utils/date';
+import { isoToGerman, handleGermanDateInput } from '$lib/shared/utils/date';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
deleted file mode 100644
index 51ca79f9..00000000
--- a/frontend/src/lib/utils.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { isoToGerman, germanToIso } from '$lib/utils/date';
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 52340f28..0984c941 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -3,14 +3,14 @@ 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 NotificationBell from '$lib/components/NotificationBell.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 { provideConfirmService } from '$lib/services/confirm.svelte.js';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.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';
 
 let { children, data } = $props();
 
diff --git a/frontend/src/routes/+page.server.ts b/frontend/src/routes/+page.server.ts
index e12e0d89..ae356311 100644
--- a/frontend/src/routes/+page.server.ts
+++ b/frontend/src/routes/+page.server.ts
@@ -1,5 +1,5 @@
 import { redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { components } from '$lib/generated/api';
 
 type StatsDTO = components['schemas']['StatsDTO'];
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 2f1f6f5f..6e06077d 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -1,10 +1,10 @@
 <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 DashboardActivityFeed from '$lib/components/DashboardActivityFeed.svelte';
-import EnrichmentBlock from '$lib/components/EnrichmentBlock.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';
 
 let { data } = $props();
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/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/DropZone.svelte b/frontend/src/routes/DropZone.svelte
index 6f43bee7..5c450123 100644
--- a/frontend/src/routes/DropZone.svelte
+++ b/frontend/src/routes/DropZone.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { invalidateAll } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 
 const ACCEPTED_TYPES = ['application/pdf', 'image/jpeg', 'image/png', 'image/tiff'];
 
diff --git a/frontend/src/routes/SearchFilterBar.svelte b/frontend/src/routes/SearchFilterBar.svelte
index eb4c6b8e..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/components/PersonTypeahead.svelte';
-import TagInput from '$lib/components/TagInput.svelte';
-import DateInput from '$lib/components/DateInput.svelte';
-import SortDropdown from '$lib/components/SortDropdown.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
+import TagInput from '$lib/tag/TagInput.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/UserMenu.svelte b/frontend/src/routes/UserMenu.svelte
index 1838bf72..37ba774a 100644
--- a/frontend/src/routes/UserMenu.svelte
+++ b/frontend/src/routes/UserMenu.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 
 let { userInitials }: { userInitials: string | null } = $props();
 
diff --git a/frontend/src/routes/admin/+layout.server.ts b/frontend/src/routes/admin/+layout.server.ts
index 08fd59bf..d4a9e6ff 100644
--- a/frontend/src/routes/admin/+layout.server.ts
+++ b/frontend/src/routes/admin/+layout.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { components } from '$lib/generated/api';
 
 type UserGroup = components['schemas']['UserGroup'];
diff --git a/frontend/src/routes/admin/groups/+layout.server.ts b/frontend/src/routes/admin/groups/+layout.server.ts
index d9cf130a..a98ba23d 100644
--- a/frontend/src/routes/admin/groups/+layout.server.ts
+++ b/frontend/src/routes/admin/groups/+layout.server.ts
@@ -1,4 +1,4 @@
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { LayoutServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async ({ fetch }) => {
diff --git a/frontend/src/routes/admin/groups/[id]/+page.server.ts b/frontend/src/routes/admin/groups/[id]/+page.server.ts
index b3441c04..a4da8b4d 100644
--- a/frontend/src/routes/admin/groups/[id]/+page.server.ts
+++ b/frontend/src/routes/admin/groups/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ params, parent }) => {
 	const { groups } = await parent();
diff --git a/frontend/src/routes/admin/groups/[id]/+page.svelte b/frontend/src/routes/admin/groups/[id]/+page.svelte
index 9b9a3574..ecfb8a5c 100644
--- a/frontend/src/routes/admin/groups/[id]/+page.svelte
+++ b/frontend/src/routes/admin/groups/[id]/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
-import { createUnsavedWarning } from '$lib/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
+import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/admin/groups/[id]/page.server.spec.ts b/frontend/src/routes/admin/groups/[id]/page.server.spec.ts
index 1c75f61d..1407e102 100644
--- a/frontend/src/routes/admin/groups/[id]/page.server.spec.ts
+++ b/frontend/src/routes/admin/groups/[id]/page.server.spec.ts
@@ -6,7 +6,7 @@ const mockApi = {
 	DELETE: vi.fn()
 };
 
-vi.mock('$lib/api.server', () => ({
+vi.mock('$lib/shared/api.server', () => ({
 	createApiClient: () => mockApi
 }));
 
diff --git a/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts
index 79daffa1..fdf05428 100644
--- a/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import Page from './+page.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
 vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() }));
diff --git a/frontend/src/routes/admin/groups/layout.server.spec.ts b/frontend/src/routes/admin/groups/layout.server.spec.ts
index a3fdc6e9..8a7df9a3 100644
--- a/frontend/src/routes/admin/groups/layout.server.spec.ts
+++ b/frontend/src/routes/admin/groups/layout.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+layout.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 function mockApi(groups: unknown[]) {
 	vi.mocked(createApiClient).mockReturnValue({
diff --git a/frontend/src/routes/admin/groups/new/+page.server.ts b/frontend/src/routes/admin/groups/new/+page.server.ts
index 1e6d7086..c8006164 100644
--- a/frontend/src/routes/admin/groups/new/+page.server.ts
+++ b/frontend/src/routes/admin/groups/new/+page.server.ts
@@ -1,7 +1,7 @@
 import { fail, redirect } from '@sveltejs/kit';
 import type { Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const actions: Actions = {
 	default: async ({ request, fetch }) => {
diff --git a/frontend/src/routes/admin/invites/+page.server.ts b/frontend/src/routes/admin/invites/+page.server.ts
index eb2c5def..e41c4922 100644
--- a/frontend/src/routes/admin/invites/+page.server.ts
+++ b/frontend/src/routes/admin/invites/+page.server.ts
@@ -1,6 +1,6 @@
 import { fail } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { parseBackendError } from '$lib/errors';
+import { parseBackendError } from '$lib/shared/errors';
 import type { Actions, PageServerLoad } from './$types';
 
 export interface InviteListItem {
diff --git a/frontend/src/routes/admin/invites/+page.svelte b/frontend/src/routes/admin/invites/+page.svelte
index bdf37878..85ac7a5d 100644
--- a/frontend/src/routes/admin/invites/+page.svelte
+++ b/frontend/src/routes/admin/invites/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { InviteListItem } from './+page.server.ts';
 
 let {
diff --git a/frontend/src/routes/admin/layout.server.spec.ts b/frontend/src/routes/admin/layout.server.spec.ts
index c6df2f28..1d744b6c 100644
--- a/frontend/src/routes/admin/layout.server.spec.ts
+++ b/frontend/src/routes/admin/layout.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+layout.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 function mockApi(users: unknown[], groups: unknown[], tags: unknown[]) {
 	vi.mocked(createApiClient).mockReturnValue({
diff --git a/frontend/src/routes/admin/ocr/+page.server.ts b/frontend/src/routes/admin/ocr/+page.server.ts
index 06e356be..bb76e818 100644
--- a/frontend/src/routes/admin/ocr/+page.server.ts
+++ b/frontend/src/routes/admin/ocr/+page.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ fetch }) => {
 	const api = createApiClient(fetch);
diff --git a/frontend/src/routes/admin/ocr/+page.svelte b/frontend/src/routes/admin/ocr/+page.svelte
index 89082c20..38eebc5d 100644
--- a/frontend/src/routes/admin/ocr/+page.svelte
+++ b/frontend/src/routes/admin/ocr/+page.svelte
@@ -3,8 +3,8 @@ import type { PageData } from './$types';
 import OcrHealthBar from './OcrHealthBar.svelte';
 import OcrStatCards from './OcrStatCards.svelte';
 import OcrModelsTable from './OcrModelsTable.svelte';
-import OcrTrainingCard from '$lib/components/OcrTrainingCard.svelte';
-import SegmentationTrainingCard from '$lib/components/SegmentationTrainingCard.svelte';
+import OcrTrainingCard from '$lib/ocr/OcrTrainingCard.svelte';
+import SegmentationTrainingCard from '$lib/ocr/SegmentationTrainingCard.svelte';
 import * as m from '$lib/paraglide/messages.js';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/admin/ocr/[personId]/+page.server.ts b/frontend/src/routes/admin/ocr/[personId]/+page.server.ts
index a95076c5..ec658a31 100644
--- a/frontend/src/routes/admin/ocr/[personId]/+page.server.ts
+++ b/frontend/src/routes/admin/ocr/[personId]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ params, fetch }) => {
 	const api = createApiClient(fetch);
diff --git a/frontend/src/routes/admin/ocr/[personId]/+page.svelte b/frontend/src/routes/admin/ocr/[personId]/+page.svelte
index d6afbd7a..31ae6ef2 100644
--- a/frontend/src/routes/admin/ocr/[personId]/+page.svelte
+++ b/frontend/src/routes/admin/ocr/[personId]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { PageData } from './$types';
-import TrainingHistory from '$lib/components/TrainingHistory.svelte';
+import TrainingHistory from '$lib/ocr/TrainingHistory.svelte';
 import * as m from '$lib/paraglide/messages.js';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/admin/ocr/[personId]/page.server.spec.ts b/frontend/src/routes/admin/ocr/[personId]/page.server.spec.ts
index 5e939a4a..2e93d323 100644
--- a/frontend/src/routes/admin/ocr/[personId]/page.server.spec.ts
+++ b/frontend/src/routes/admin/ocr/[personId]/page.server.spec.ts
@@ -3,7 +3,7 @@ import { load } from './+page.server';
 
 const mockApi = { GET: vi.fn() };
 
-vi.mock('$lib/api.server', () => ({ createApiClient: () => mockApi }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: () => mockApi }));
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/admin/ocr/global/+page.server.ts b/frontend/src/routes/admin/ocr/global/+page.server.ts
index fb1d8dfc..a9f6d743 100644
--- a/frontend/src/routes/admin/ocr/global/+page.server.ts
+++ b/frontend/src/routes/admin/ocr/global/+page.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ fetch }) => {
 	const api = createApiClient(fetch);
diff --git a/frontend/src/routes/admin/ocr/global/+page.svelte b/frontend/src/routes/admin/ocr/global/+page.svelte
index b0991a4e..ead71439 100644
--- a/frontend/src/routes/admin/ocr/global/+page.svelte
+++ b/frontend/src/routes/admin/ocr/global/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { PageData } from './$types';
-import TrainingHistory from '$lib/components/TrainingHistory.svelte';
+import TrainingHistory from '$lib/ocr/TrainingHistory.svelte';
 import * as m from '$lib/paraglide/messages.js';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/admin/ocr/global/page.server.spec.ts b/frontend/src/routes/admin/ocr/global/page.server.spec.ts
index cbc78eb0..9aa48f64 100644
--- a/frontend/src/routes/admin/ocr/global/page.server.spec.ts
+++ b/frontend/src/routes/admin/ocr/global/page.server.spec.ts
@@ -3,7 +3,7 @@ import { load } from './+page.server';
 
 const mockApi = { GET: vi.fn() };
 
-vi.mock('$lib/api.server', () => ({ createApiClient: () => mockApi }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: () => mockApi }));
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/admin/ocr/page.server.spec.ts b/frontend/src/routes/admin/ocr/page.server.spec.ts
index b3b27a03..b2abe869 100644
--- a/frontend/src/routes/admin/ocr/page.server.spec.ts
+++ b/frontend/src/routes/admin/ocr/page.server.spec.ts
@@ -3,7 +3,7 @@ import { load } from './+page.server';
 
 const mockApi = { GET: vi.fn() };
 
-vi.mock('$lib/api.server', () => ({ createApiClient: () => mockApi }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: () => mockApi }));
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/admin/tags/+layout.server.ts b/frontend/src/routes/admin/tags/+layout.server.ts
index f348a953..a1e66b07 100644
--- a/frontend/src/routes/admin/tags/+layout.server.ts
+++ b/frontend/src/routes/admin/tags/+layout.server.ts
@@ -1,4 +1,4 @@
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { components } from '$lib/generated/api';
 import type { LayoutServerLoad } from './$types';
 
diff --git a/frontend/src/routes/admin/tags/[id]/+page.server.ts b/frontend/src/routes/admin/tags/[id]/+page.server.ts
index ffa99d47..c88b6b5e 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.server.ts
+++ b/frontend/src/routes/admin/tags/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ params, parent, url }) => {
 	const { tags } = await parent();
diff --git a/frontend/src/routes/admin/tags/[id]/+page.svelte b/frontend/src/routes/admin/tags/[id]/+page.svelte
index 2172ec25..8278d7c5 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.svelte
+++ b/frontend/src/routes/admin/tags/[id]/+page.svelte
@@ -3,9 +3,9 @@ import { enhance } from '$app/forms';
 import { replaceState } from '$app/navigation';
 import { page } from '$app/stores';
 import { m } from '$lib/paraglide/messages.js';
-import { createUnsavedWarning } from '$lib/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
-import TagParentPicker from '$lib/components/TagParentPicker.svelte';
+import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.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';
 import TagMergeZone from './TagMergeZone.svelte';
diff --git a/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte b/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte
index 374e2f89..84c64fef 100644
--- a/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte
+++ b/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 
 type FlatTag = {
 	id: string;
diff --git a/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte.spec.ts b/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte.spec.ts
index c32bfcd3..c55fd080 100644
--- a/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte.spec.ts
+++ b/frontend/src/routes/admin/tags/[id]/TagDeleteGuard.svelte.spec.ts
@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import TagDeleteGuard from './TagDeleteGuard.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
 
diff --git a/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte b/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
index e4086286..9c77d5c0 100644
--- a/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
+++ b/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import TagParentPicker from '$lib/components/TagParentPicker.svelte';
+import TagParentPicker from '$lib/tag/TagParentPicker.svelte';
 
 type FlatTag = {
 	id: string;
diff --git a/frontend/src/routes/admin/tags/[id]/page.server.spec.ts b/frontend/src/routes/admin/tags/[id]/page.server.spec.ts
index ee370c1f..a4614eae 100644
--- a/frontend/src/routes/admin/tags/[id]/page.server.spec.ts
+++ b/frontend/src/routes/admin/tags/[id]/page.server.spec.ts
@@ -7,7 +7,7 @@ const mockApi = {
 	DELETE: vi.fn()
 };
 
-vi.mock('$lib/api.server', () => ({
+vi.mock('$lib/shared/api.server', () => ({
 	createApiClient: () => mockApi
 }));
 
diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
index 30a46220..d4386c0d 100644
--- a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import Page from './+page.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
 vi.mock('$app/navigation', () => ({
diff --git a/frontend/src/routes/admin/tags/layout.server.spec.ts b/frontend/src/routes/admin/tags/layout.server.spec.ts
index 3a4bc3de..80879593 100644
--- a/frontend/src/routes/admin/tags/layout.server.spec.ts
+++ b/frontend/src/routes/admin/tags/layout.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+layout.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 function mockTreeApi(tree: unknown[]) {
 	vi.mocked(createApiClient).mockReturnValue({
diff --git a/frontend/src/routes/admin/users/+layout.server.ts b/frontend/src/routes/admin/users/+layout.server.ts
index 97be1fe5..16ae4958 100644
--- a/frontend/src/routes/admin/users/+layout.server.ts
+++ b/frontend/src/routes/admin/users/+layout.server.ts
@@ -1,4 +1,4 @@
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { LayoutServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async ({ fetch }) => {
diff --git a/frontend/src/routes/admin/users/[id]/+page.server.ts b/frontend/src/routes/admin/users/[id]/+page.server.ts
index 3d0270aa..e4c0f81c 100644
--- a/frontend/src/routes/admin/users/[id]/+page.server.ts
+++ b/frontend/src/routes/admin/users/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ params, fetch, locals }) => {
 	const user = locals.user;
diff --git a/frontend/src/routes/admin/users/[id]/+page.svelte b/frontend/src/routes/admin/users/[id]/+page.svelte
index a9a19568..05c8a74a 100644
--- a/frontend/src/routes/admin/users/[id]/+page.svelte
+++ b/frontend/src/routes/admin/users/[id]/+page.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
-import UserProfileSection from '$lib/components/user/UserProfileSection.svelte';
-import UserGroupsSection from '$lib/components/user/UserGroupsSection.svelte';
-import UserPasswordSection from '$lib/components/user/UserPasswordSection.svelte';
-import { createUnsavedWarning } from '$lib/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+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/shared/primitives/UnsavedWarningBanner.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
index d83ce3dd..dd8325a9 100644
--- a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import Page from './+page.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 const cancelMock = vi.hoisted(() => vi.fn());
 
diff --git a/frontend/src/routes/admin/users/layout.server.spec.ts b/frontend/src/routes/admin/users/layout.server.spec.ts
index 8ddc9c54..c6211147 100644
--- a/frontend/src/routes/admin/users/layout.server.spec.ts
+++ b/frontend/src/routes/admin/users/layout.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+layout.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 function mockApi(users: unknown[]) {
 	vi.mocked(createApiClient).mockReturnValue({
diff --git a/frontend/src/routes/admin/users/new/+page.server.ts b/frontend/src/routes/admin/users/new/+page.server.ts
index ad2c7f61..8eebe742 100644
--- a/frontend/src/routes/admin/users/new/+page.server.ts
+++ b/frontend/src/routes/admin/users/new/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import type { PageServerLoad, Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ fetch, locals }) => {
 	const user = locals.user;
diff --git a/frontend/src/routes/admin/users/new/+page.svelte b/frontend/src/routes/admin/users/new/+page.svelte
index b06f19e8..14cb3f2d 100644
--- a/frontend/src/routes/admin/users/new/+page.svelte
+++ b/frontend/src/routes/admin/users/new/+page.svelte
@@ -2,8 +2,8 @@
 import { enhance } from '$app/forms';
 import { beforeNavigate, goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import UserProfileSection from '$lib/components/user/UserProfileSection.svelte';
-import UserGroupsSection from '$lib/components/user/UserGroupsSection.svelte';
+import UserProfileSection from '$lib/user/UserProfileSection.svelte';
+import UserGroupsSection from '$lib/user/UserGroupsSection.svelte';
 import AccountSection from './AccountSection.svelte';
 
 let { data, form } = $props();
diff --git a/frontend/src/routes/aktivitaeten/+page.server.ts b/frontend/src/routes/aktivitaeten/+page.server.ts
index 89addea6..21df3e85 100644
--- a/frontend/src/routes/aktivitaeten/+page.server.ts
+++ b/frontend/src/routes/aktivitaeten/+page.server.ts
@@ -1,4 +1,4 @@
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { components, operations } from '$lib/generated/api';
 
 type ActivityFeedItemDTO = components['schemas']['ActivityFeedItemDTO'];
diff --git a/frontend/src/routes/aktivitaeten/+page.svelte b/frontend/src/routes/aktivitaeten/+page.svelte
index 719a1ab3..fa870696 100644
--- a/frontend/src/routes/aktivitaeten/+page.svelte
+++ b/frontend/src/routes/aktivitaeten/+page.svelte
@@ -3,12 +3,12 @@ import { onMount, onDestroy } from 'svelte';
 import { goto } from '$app/navigation';
 import { page, navigating } from '$app/state';
 import * as m from '$lib/paraglide/messages.js';
-import { notificationStore, type NotificationItem } from '$lib/stores/notifications.svelte';
-import ChronikFuerDichBox from '$lib/components/chronik/ChronikFuerDichBox.svelte';
-import ChronikFilterPills from '$lib/components/chronik/ChronikFilterPills.svelte';
-import ChronikTimeline from '$lib/components/chronik/ChronikTimeline.svelte';
-import ChronikEmptyState from '$lib/components/chronik/ChronikEmptyState.svelte';
-import ChronikErrorCard from '$lib/components/chronik/ChronikErrorCard.svelte';
+import { notificationStore, type NotificationItem } from '$lib/notification/notifications.svelte';
+import ChronikFuerDichBox from '$lib/activity/ChronikFuerDichBox.svelte';
+import ChronikFilterPills from '$lib/activity/ChronikFilterPills.svelte';
+import ChronikTimeline from '$lib/activity/ChronikTimeline.svelte';
+import ChronikEmptyState from '$lib/activity/ChronikEmptyState.svelte';
+import ChronikErrorCard from '$lib/activity/ChronikErrorCard.svelte';
 import type { components } from '$lib/generated/api';
 import type { FilterValue } from './+page.server';
 import { applyClientFilter } from './clientFilter';
diff --git a/frontend/src/routes/aktivitaeten/page.server.spec.ts b/frontend/src/routes/aktivitaeten/page.server.spec.ts
index fe4809d8..91f0d31f 100644
--- a/frontend/src/routes/aktivitaeten/page.server.spec.ts
+++ b/frontend/src/routes/aktivitaeten/page.server.spec.ts
@@ -5,7 +5,7 @@ const mockApi = {
 	GET: vi.fn()
 };
 
-vi.mock('$lib/api.server', () => ({
+vi.mock('$lib/shared/api.server', () => ({
 	createApiClient: () => mockApi
 }));
 
diff --git a/frontend/src/routes/briefwechsel/+page.server.ts b/frontend/src/routes/briefwechsel/+page.server.ts
index 38427f5c..fd8f5ee4 100644
--- a/frontend/src/routes/briefwechsel/+page.server.ts
+++ b/frontend/src/routes/briefwechsel/+page.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import type { components } from '$lib/generated/api';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export async function load({ url, fetch, locals }) {
 	const senderId = url.searchParams.get('senderId') || '';
diff --git a/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte b/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
index a14bca9b..1ac6d236 100644
--- a/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
+++ b/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/routes/briefwechsel/ConversationTimeline.svelte b/frontend/src/routes/briefwechsel/ConversationTimeline.svelte
index e1a342c1..3cb2dba9 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 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 };
 type Tag = { id: string; name: string };
diff --git a/frontend/src/routes/briefwechsel/CorrespondentSuggestionsDropdown.svelte b/frontend/src/routes/briefwechsel/CorrespondentSuggestionsDropdown.svelte
index 29df8b1f..41f16b5e 100644
--- a/frontend/src/routes/briefwechsel/CorrespondentSuggestionsDropdown.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondentSuggestionsDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { clickOutside } from '$lib/actions/clickOutside';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 
 interface Correspondent {
 	id: 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/briefwechsel/CorrespondenzHero.svelte b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
index e059370d..4543c02e 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { onMount, tick } from 'svelte';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 interface RecentPerson {
diff --git a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
index 62d67337..5dc6bc34 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import CorrespondentSuggestionsDropdown from './CorrespondentSuggestionsDropdown.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/routes/briefwechsel/page.server.spec.ts b/frontend/src/routes/briefwechsel/page.server.spec.ts
index 151436b6..16ad7637 100644
--- a/frontend/src/routes/briefwechsel/page.server.spec.ts
+++ b/frontend/src/routes/briefwechsel/page.server.spec.ts
@@ -1,10 +1,12 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+page.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
-vi.mock('$lib/errors', () => ({ getErrorMessage: (code: string) => code ?? 'Unknown error' }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/errors', () => ({
+	getErrorMessage: (code: string) => code ?? 'Unknown error'
+}));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 const writeUser = { groups: [{ permissions: ['WRITE_ALL'] }] };
 const readUser = { groups: [{ permissions: ['READ_ALL'] }] };
diff --git a/frontend/src/routes/documents/+page.server.ts b/frontend/src/routes/documents/+page.server.ts
index f9e4daf4..c969f88e 100644
--- a/frontend/src/routes/documents/+page.server.ts
+++ b/frontend/src/routes/documents/+page.server.ts
@@ -1,6 +1,6 @@
 import { redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { components } from '$lib/generated/api';
 
 type DocumentSearchItem = components['schemas']['DocumentSearchItem'];
diff --git a/frontend/src/routes/documents/+page.svelte b/frontend/src/routes/documents/+page.svelte
index 60c0c299..4a5e0616 100644
--- a/frontend/src/routes/documents/+page.svelte
+++ b/frontend/src/routes/documents/+page.svelte
@@ -5,10 +5,10 @@ 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 BulkSelectionBar from '$lib/components/document/BulkSelectionBar.svelte';
-import { bulkSelectionStore } from '$lib/stores/bulkSelection.svelte';
-import { getErrorMessage, parseBackendError } from '$lib/errors';
+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/shared/errors';
 import * as m from '$lib/paraglide/messages.js';
 
 let { data } = $props();
diff --git a/frontend/src/routes/documents/[id]/+page.server.ts b/frontend/src/routes/documents/[id]/+page.server.ts
index 6f3d297b..478d70ef 100644
--- a/frontend/src/routes/documents/[id]/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
-import { inferredRelationshipLabel } from '$lib/relationshipLabels';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
+import { inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 
 export async function load({ params, fetch }) {
 	const { id } = params;
diff --git a/frontend/src/routes/documents/[id]/+page.svelte b/frontend/src/routes/documents/[id]/+page.svelte
index 49810b90..0c5b6956 100644
--- a/frontend/src/routes/documents/[id]/+page.svelte
+++ b/frontend/src/routes/documents/[id]/+page.svelte
@@ -3,17 +3,17 @@ 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 TranscriptionEditView from '$lib/components/TranscriptionEditView.svelte';
-import TranscriptionReadView from '$lib/components/TranscriptionReadView.svelte';
-import TranscriptionPanelHeader from '$lib/components/TranscriptionPanelHeader.svelte';
-import type { TranscriptionBlockData } from '$lib/types';
-import { getErrorMessage } from '$lib/errors';
+import DocumentTopBar from '$lib/document/DocumentTopBar.svelte';
+import DocumentViewer from '$lib/document/DocumentViewer.svelte';
+import TranscriptionEditView from '$lib/document/transcription/TranscriptionEditView.svelte';
+import TranscriptionReadView from '$lib/document/transcription/TranscriptionReadView.svelte';
+import TranscriptionPanelHeader from '$lib/document/transcription/TranscriptionPanelHeader.svelte';
+import type { TranscriptionBlockData } from '$lib/shared/types';
+import { getErrorMessage } from '$lib/shared/errors';
 import { translateOcrProgress } from '$lib/ocr/translateOcrProgress';
-import { createFileLoader } from '$lib/hooks/useFileLoader.svelte';
-import { scrollToCommentFromQuery } from '$lib/utils/deepLinkScroll';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { createFileLoader } from '$lib/document/viewer/useFileLoader.svelte';
+import { scrollToCommentFromQuery } from '$lib/shared/utils/deepLinkScroll';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 
 let { data } = $props();
 
@@ -91,10 +91,12 @@ async function loadTranscriptionBlocks() {
 async function saveBlock(
 	blockId: string,
 	text: string,
-	mentionedPersons: import('$lib/types').PersonMention[]
+	mentionedPersons: import('$lib/shared/types').PersonMention[]
 ) {
-	const { saveBlockWithConflictRetry } = await import('$lib/utils/saveBlockWithConflictRetry');
-	const { BlockConflictResolvedError } = await import('$lib/utils/blockConflictMerge');
+	const { saveBlockWithConflictRetry } =
+		await import('$lib/document/transcription/saveBlockWithConflictRetry');
+	const { BlockConflictResolvedError } =
+		await import('$lib/document/transcription/blockConflictMerge');
 	try {
 		const updated = await saveBlockWithConflictRetry({
 			fetchImpl: fetch,
diff --git a/frontend/src/routes/documents/[id]/edit/+page.server.ts b/frontend/src/routes/documents/[id]/edit/+page.server.ts
index 7eb7efa9..1dec1ead 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/edit/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { createApiClient } from '$lib/api.server';
-import { parseBackendError, getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { parseBackendError, getErrorMessage } from '$lib/shared/errors';
 
 export async function load({
 	params,
diff --git a/frontend/src/routes/documents/[id]/edit/+page.svelte b/frontend/src/routes/documents/[id]/edit/+page.svelte
index fcd0f2a9..9a333120 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.svelte
+++ b/frontend/src/routes/documents/[id]/edit/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 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 { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+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/documents/[id]/edit/page.svelte.spec.ts b/frontend/src/routes/documents/[id]/edit/page.svelte.spec.ts
index 8ddb2614..573b037e 100644
--- a/frontend/src/routes/documents/[id]/edit/page.svelte.spec.ts
+++ b/frontend/src/routes/documents/[id]/edit/page.svelte.spec.ts
@@ -1,7 +1,7 @@
 import { vi, describe, it, expect, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 import EditPage from './+page.svelte';
 
 afterEach(cleanup);
diff --git a/frontend/src/routes/documents/[id]/page.server.spec.ts b/frontend/src/routes/documents/[id]/page.server.spec.ts
index bb8f421a..591a229d 100644
--- a/frontend/src/routes/documents/[id]/page.server.spec.ts
+++ b/frontend/src/routes/documents/[id]/page.server.spec.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 vi.mock('$env/dynamic/private', () => ({ env: { API_INTERNAL_URL: 'http://test-backend:8080' } }));
 
 import { load } from './+page.server';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/documents/bulk-edit/+page.svelte b/frontend/src/routes/documents/bulk-edit/+page.svelte
index ba57e0e4..7138a3d0 100644
--- a/frontend/src/routes/documents/bulk-edit/+page.svelte
+++ b/frontend/src/routes/documents/bulk-edit/+page.svelte
@@ -1,11 +1,11 @@
 <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';
-import { getErrorMessage, parseBackendError } from '$lib/errors';
+} from '$lib/document/BulkDocumentEditLayout.svelte';
+import { getErrorMessage, parseBackendError } from '$lib/shared/errors';
 import { m } from '$lib/paraglide/messages.js';
 
 let entries = $state<BulkEditEntry[]>([]);
diff --git a/frontend/src/routes/documents/new/+page.server.ts b/frontend/src/routes/documents/new/+page.server.ts
index d58b2ec9..b54496c3 100644
--- a/frontend/src/routes/documents/new/+page.server.ts
+++ b/frontend/src/routes/documents/new/+page.server.ts
@@ -1,7 +1,7 @@
 import { fail, redirect } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { createApiClient } from '$lib/api.server';
-import { parseBackendError, getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { parseBackendError, getErrorMessage } from '$lib/shared/errors';
 
 export async function load({
 	fetch,
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/documents/page.server.spec.ts b/frontend/src/routes/documents/page.server.spec.ts
index d99c8d8d..ebf69be0 100644
--- a/frontend/src/routes/documents/page.server.spec.ts
+++ b/frontend/src/routes/documents/page.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
 import { load } from './+page.server';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/enrich/+page.server.ts b/frontend/src/routes/enrich/+page.server.ts
index 65d86b8f..39937038 100644
--- a/frontend/src/routes/enrich/+page.server.ts
+++ b/frontend/src/routes/enrich/+page.server.ts
@@ -1,5 +1,5 @@
 import { redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 export async function load({
 	fetch,
diff --git a/frontend/src/routes/enrich/+page.svelte b/frontend/src/routes/enrich/+page.svelte
index ff0a1136..08b29126 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 BackButton from '$lib/shared/primitives/BackButton.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.server.ts b/frontend/src/routes/enrich/[id]/+page.server.ts
index fe1fcdb7..b9f2736d 100644
--- a/frontend/src/routes/enrich/[id]/+page.server.ts
+++ b/frontend/src/routes/enrich/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, redirect } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage, parseBackendError } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage, parseBackendError } from '$lib/shared/errors';
 
 export async function load({
 	params,
diff --git a/frontend/src/routes/enrich/[id]/+page.svelte b/frontend/src/routes/enrich/[id]/+page.svelte
index 0d7e22d8..15847b19 100644
--- a/frontend/src/routes/enrich/[id]/+page.svelte
+++ b/frontend/src/routes/enrich/[id]/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 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 BackButton from '$lib/shared/primitives/BackButton.svelte';
+import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
 let { data, form } = $props();
 
diff --git a/frontend/src/routes/forgot-password/+page.server.ts b/frontend/src/routes/forgot-password/+page.server.ts
index 19914658..6586484c 100644
--- a/frontend/src/routes/forgot-password/+page.server.ts
+++ b/frontend/src/routes/forgot-password/+page.server.ts
@@ -1,6 +1,6 @@
 import { fail } from '@sveltejs/kit';
 import type { Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 export const actions = {
 	default: async ({ request, fetch }) => {
diff --git a/frontend/src/routes/geschichten/+page.server.ts b/frontend/src/routes/geschichten/+page.server.ts
index 54072df6..3d8044a9 100644
--- a/frontend/src/routes/geschichten/+page.server.ts
+++ b/frontend/src/routes/geschichten/+page.server.ts
@@ -1,6 +1,6 @@
 import { error } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { components } from '$lib/generated/api';
 import type { PageServerLoad } from './$types';
 
diff --git a/frontend/src/routes/geschichten/+page.svelte b/frontend/src/routes/geschichten/+page.svelte
index da5a4334..7ced4ade 100644
--- a/frontend/src/routes/geschichten/+page.svelte
+++ b/frontend/src/routes/geschichten/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { plainExcerpt } from '$lib/utils/extractText';
-import { formatDate } from '$lib/utils/date';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import { plainExcerpt } from '$lib/shared/utils/extractText';
+import { formatDate } from '$lib/shared/utils/date';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/geschichten/[id]/+page.server.ts b/frontend/src/routes/geschichten/[id]/+page.server.ts
index bb4b3314..5d28c74e 100644
--- a/frontend/src/routes/geschichten/[id]/+page.server.ts
+++ b/frontend/src/routes/geschichten/[id]/+page.server.ts
@@ -1,6 +1,6 @@
 import { error } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ params, fetch }) => {
diff --git a/frontend/src/routes/geschichten/[id]/+page.svelte b/frontend/src/routes/geschichten/[id]/+page.svelte
index f7ba5541..b13c2189 100644
--- a/frontend/src/routes/geschichten/[id]/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/+page.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { safeHtml } from '$lib/utils/sanitize';
-import { formatDate } from '$lib/utils/date';
-import { getConfirmService } from '$lib/services/confirm.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
+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/shared/primitives/BackButton.svelte';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/geschichten/[id]/edit/+page.server.ts b/frontend/src/routes/geschichten/[id]/edit/+page.server.ts
index 7d397921..53afd234 100644
--- a/frontend/src/routes/geschichten/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/geschichten/[id]/edit/+page.server.ts
@@ -1,6 +1,6 @@
 import { error, redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ params, fetch, parent }) => {
diff --git a/frontend/src/routes/geschichten/[id]/edit/+page.svelte b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
index 80bf0bf7..709563bb 100644
--- a/frontend/src/routes/geschichten/[id]/edit/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import GeschichteEditor from '$lib/components/GeschichteEditor.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
-import { getErrorMessage } from '$lib/errors';
+import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/geschichten/new/+page.server.ts b/frontend/src/routes/geschichten/new/+page.server.ts
index 66f748e8..3983d924 100644
--- a/frontend/src/routes/geschichten/new/+page.server.ts
+++ b/frontend/src/routes/geschichten/new/+page.server.ts
@@ -1,5 +1,5 @@
 import { redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ url, fetch, parent }) => {
diff --git a/frontend/src/routes/geschichten/new/+page.svelte b/frontend/src/routes/geschichten/new/+page.svelte
index 57f9cf49..cf94c1f0 100644
--- a/frontend/src/routes/geschichten/new/+page.svelte
+++ b/frontend/src/routes/geschichten/new/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import GeschichteEditor from '$lib/components/GeschichteEditor.svelte';
-import BackButton from '$lib/components/BackButton.svelte';
-import { getErrorMessage } from '$lib/errors';
+import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
+import BackButton from '$lib/shared/primitives/BackButton.svelte';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
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/login/+page.server.ts b/frontend/src/routes/login/+page.server.ts
index 4c29b511..d3e22098 100644
--- a/frontend/src/routes/login/+page.server.ts
+++ b/frontend/src/routes/login/+page.server.ts
@@ -1,6 +1,6 @@
 import { fail, redirect, type Actions } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = ({ url }) => {
diff --git a/frontend/src/routes/page.server.spec.ts b/frontend/src/routes/page.server.spec.ts
index 06caaf9a..8832bde2 100644
--- a/frontend/src/routes/page.server.spec.ts
+++ b/frontend/src/routes/page.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
 import { load } from './+page.server';
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 beforeEach(() => vi.clearAllMocks());
 
diff --git a/frontend/src/routes/persons/+page.server.ts b/frontend/src/routes/persons/+page.server.ts
index 79ad39bc..62a1f8cf 100644
--- a/frontend/src/routes/persons/+page.server.ts
+++ b/frontend/src/routes/persons/+page.server.ts
@@ -1,6 +1,6 @@
 import { error } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export async function load({ url, fetch, locals }) {
 	const q = url.searchParams.get('q') || '';
diff --git a/frontend/src/routes/persons/+page.svelte b/frontend/src/routes/persons/+page.svelte
index a9fc76a9..5522d3ad 100644
--- a/frontend/src/routes/persons/+page.svelte
+++ b/frontend/src/routes/persons/+page.svelte
@@ -2,8 +2,8 @@
 import { goto } from '$app/navigation';
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import PersonTypeBadge from '$lib/components/PersonTypeBadge.svelte';
+import { formatLifeDateRange } from '$lib/person/personLifeDates';
+import PersonTypeBadge from '$lib/person/PersonTypeBadge.svelte';
 import PersonsStatsBar from './PersonsStatsBar.svelte';
 import PersonsEmptyState from './PersonsEmptyState.svelte';
 
diff --git a/frontend/src/routes/persons/[id]/+page.server.ts b/frontend/src/routes/persons/[id]/+page.server.ts
index 1fa9db55..2abf9062 100644
--- a/frontend/src/routes/persons/[id]/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/+page.server.ts
@@ -1,6 +1,6 @@
 import { error } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export async function load({ params, fetch, locals }) {
 	const { id } = params;
diff --git a/frontend/src/routes/persons/[id]/+page.svelte b/frontend/src/routes/persons/[id]/+page.svelte
index 3a627892..3518f82b 100644
--- a/frontend/src/routes/persons/[id]/+page.svelte
+++ b/frontend/src/routes/persons/[id]/+page.svelte
@@ -1,13 +1,13 @@
 <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';
 import PersonDocumentList from './PersonDocumentList.svelte';
 import PersonRelationshipsCard from './PersonRelationshipsCard.svelte';
-import GeschichtenCard from '$lib/components/GeschichtenCard.svelte';
+import GeschichtenCard from '$lib/geschichte/GeschichtenCard.svelte';
 
 let { data } = $props();
 
diff --git a/frontend/src/routes/persons/[id]/PersonCard.svelte b/frontend/src/routes/persons/[id]/PersonCard.svelte
index 7d30ebb4..b829f8f5 100644
--- a/frontend/src/routes/persons/[id]/PersonCard.svelte
+++ b/frontend/src/routes/persons/[id]/PersonCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import PersonTypeBadge from '$lib/components/PersonTypeBadge.svelte';
+import { formatLifeDateRange } from '$lib/person/personLifeDates';
+import PersonTypeBadge from '$lib/person/PersonTypeBadge.svelte';
 
 let {
 	person,
diff --git a/frontend/src/routes/persons/[id]/PersonDocumentList.svelte b/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
index 228c8f12..c88b3c9d 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 { sortDocumentsByDate, type SortDir } from '$lib/utils/sort';
-import DocumentThumbnail from '$lib/components/DocumentThumbnail.svelte';
+import { formatDate } from '$lib/shared/utils/date';
+import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
+import { sortDocumentsByDate, type SortDir } from '$lib/shared/utils/sort';
+import DocumentThumbnail from '$lib/document/DocumentThumbnail.svelte';
 
 const DOCS_PREVIEW_LIMIT = 5;
 
diff --git a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
index b032a15d..fecb5f03 100644
--- a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
+++ b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
index 4cfe9898..e080d0c9 100644
--- a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
+++ b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
@@ -4,7 +4,7 @@ import { page } from 'vitest/browser';
 import PersonMergePanel from './PersonMergePanel.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({
 	default: () => null
 }));
 
diff --git a/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte b/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
index 96ca77a1..389cd894 100644
--- a/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
+++ b/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/routes/persons/[id]/edit/+page.server.ts b/frontend/src/routes/persons/[id]/edit/+page.server.ts
index 9658e59f..d42e2c1a 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/edit/+page.server.ts
@@ -1,11 +1,11 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import {
 	normalizePersonType,
 	validatePersonFields,
 	resolveValidationMessage
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 export async function load({ params, fetch, locals }) {
 	const canWrite =
diff --git a/frontend/src/routes/persons/[id]/edit/+page.svelte b/frontend/src/routes/persons/[id]/edit/+page.svelte
index f7dd05ce..9d2124da 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.svelte
+++ b/frontend/src/routes/persons/[id]/edit/+page.svelte
@@ -1,12 +1,12 @@
 <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';
 import PersonMergePanel from '../PersonMergePanel.svelte';
-import StammbaumCard from '$lib/components/StammbaumCard.svelte';
+import StammbaumCard from '$lib/person/genealogy/StammbaumCard.svelte';
 
 let { data, form } = $props();
 const person = $derived(data.person);
diff --git a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte
index e4eb86e3..ab978ab9 100644
--- a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte
+++ b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 
 interface Props {
 	aliases: Array<{
diff --git a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.spec.ts b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.spec.ts
index 271cf4aa..979ca1ae 100644
--- a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.spec.ts
+++ b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.spec.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import NameHistoryEditCard from './NameHistoryEditCard.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
 
diff --git a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.test.ts b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.test.ts
index 1073aed2..291573fc 100644
--- a/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.test.ts
+++ b/frontend/src/routes/persons/[id]/edit/NameHistoryEditCard.svelte.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import NameHistoryEditCard from './NameHistoryEditCard.svelte';
-import { createConfirmService, CONFIRM_KEY } from '$lib/services/confirm.svelte.js';
+import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
 
diff --git a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
index b53599ea..45a30330 100644
--- a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
+++ b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
+import PersonTypeSelector from '$lib/person/PersonTypeSelector.svelte';
 import {
 	PERSON_TYPES as TYPES,
 	type PersonType,
 	type PersonFormData
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 let { person }: { person: PersonFormData } = $props();
 
diff --git a/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts b/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
index f8f49194..8ab799c2 100644
--- a/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
+++ b/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { normalizePersonType } from '$lib/person-validation';
+import { normalizePersonType } from '$lib/person/person-validation';
 
 describe('edit load — SKIP → UNKNOWN normalization', () => {
 	it('maps SKIP to UNKNOWN', () => {
diff --git a/frontend/src/routes/persons/[id]/page.server.spec.ts b/frontend/src/routes/persons/[id]/page.server.spec.ts
index c239c7df..45d60ce6 100644
--- a/frontend/src/routes/persons/[id]/page.server.spec.ts
+++ b/frontend/src/routes/persons/[id]/page.server.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { load } from './+page.server';
 
-vi.mock('$lib/api.server', () => ({ createApiClient: vi.fn() }));
+vi.mock('$lib/shared/api.server', () => ({ createApiClient: vi.fn() }));
 
-import { createApiClient } from '$lib/api.server';
+import { createApiClient } from '$lib/shared/api.server';
 
 const mockFetch = vi.fn() as unknown as typeof fetch;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/frontend/src/routes/persons/new/+page.server.ts b/frontend/src/routes/persons/new/+page.server.ts
index 73d6cc8e..8dff7899 100644
--- a/frontend/src/routes/persons/new/+page.server.ts
+++ b/frontend/src/routes/persons/new/+page.server.ts
@@ -1,11 +1,11 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 import {
 	normalizePersonType,
 	validatePersonFields,
 	resolveValidationMessage
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 export async function load({ locals }: { locals: App.Locals }) {
 	const canWrite =
diff --git a/frontend/src/routes/persons/new/+page.svelte b/frontend/src/routes/persons/new/+page.svelte
index 7f9ccc48..16a9359a 100644
--- a/frontend/src/routes/persons/new/+page.svelte
+++ b/frontend/src/routes/persons/new/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import BackButton from '$lib/components/BackButton.svelte';
-import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
-import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person-validation';
+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';
 
 let { form } = $props();
 
diff --git a/frontend/src/routes/profile/+page.server.ts b/frontend/src/routes/profile/+page.server.ts
index bcfd2be3..ec40ca45 100644
--- a/frontend/src/routes/profile/+page.server.ts
+++ b/frontend/src/routes/profile/+page.server.ts
@@ -1,8 +1,8 @@
 import { fail } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
 import type { PageServerLoad, Actions } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 const apiBase = () => env.API_INTERNAL_URL || 'http://localhost:8080';
 
diff --git a/frontend/src/routes/profile/PersonalInfoForm.svelte b/frontend/src/routes/profile/PersonalInfoForm.svelte
index 684f8462..8b32ddee 100644
--- a/frontend/src/routes/profile/PersonalInfoForm.svelte
+++ b/frontend/src/routes/profile/PersonalInfoForm.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { untrack } from 'svelte';
-import { isoToGerman, handleGermanDateInput } from '$lib/utils/date';
+import { isoToGerman, handleGermanDateInput } from '$lib/shared/utils/date';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/routes/register/+page.server.ts b/frontend/src/routes/register/+page.server.ts
index dd656d5d..038b04b4 100644
--- a/frontend/src/routes/register/+page.server.ts
+++ b/frontend/src/routes/register/+page.server.ts
@@ -1,6 +1,6 @@
 import { fail, redirect } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
-import { parseBackendError } from '$lib/errors';
+import { parseBackendError } from '$lib/shared/errors';
 import type { Actions, PageServerLoad } from './$types';
 
 interface InvitePrefill {
diff --git a/frontend/src/routes/register/+page.svelte b/frontend/src/routes/register/+page.svelte
index 1e28050c..32f65f12 100644
--- a/frontend/src/routes/register/+page.svelte
+++ b/frontend/src/routes/register/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 import { enhance } from '$app/forms';
 import AuthHeader from '../AuthHeader.svelte';
 
diff --git a/frontend/src/routes/reset-password/+page.server.ts b/frontend/src/routes/reset-password/+page.server.ts
index 200067e6..7dac752e 100644
--- a/frontend/src/routes/reset-password/+page.server.ts
+++ b/frontend/src/routes/reset-password/+page.server.ts
@@ -1,7 +1,7 @@
 import { fail } from '@sveltejs/kit';
 import type { Actions, PageServerLoad } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { parseBackendError } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { parseBackendError } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ url }) => {
 	const token = url.searchParams.get('token');
diff --git a/frontend/src/routes/reset-password/+page.svelte b/frontend/src/routes/reset-password/+page.svelte
index bfdbd6b6..7765090c 100644
--- a/frontend/src/routes/reset-password/+page.svelte
+++ b/frontend/src/routes/reset-password/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 
 let {
 	data,
diff --git a/frontend/src/routes/stammbaum/+page.server.ts b/frontend/src/routes/stammbaum/+page.server.ts
index b35c75d5..d0c8fc45 100644
--- a/frontend/src/routes/stammbaum/+page.server.ts
+++ b/frontend/src/routes/stammbaum/+page.server.ts
@@ -1,6 +1,6 @@
 import { error, redirect } from '@sveltejs/kit';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export async function load({ fetch }) {
 	const api = createApiClient(fetch);
diff --git a/frontend/src/routes/stammbaum/+page.svelte b/frontend/src/routes/stammbaum/+page.svelte
index f2e4423b..f2c774dc 100644
--- a/frontend/src/routes/stammbaum/+page.svelte
+++ b/frontend/src/routes/stammbaum/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { page } from '$app/state';
-import StammbaumTree from '$lib/components/StammbaumTree.svelte';
-import StammbaumSidePanel from '$lib/components/StammbaumSidePanel.svelte';
+import StammbaumTree from '$lib/person/genealogy/StammbaumTree.svelte';
+import StammbaumSidePanel from '$lib/person/genealogy/StammbaumSidePanel.svelte';
 import type { components } from '$lib/generated/api';
 
 type PersonNodeDTO = components['schemas']['PersonNodeDTO'];
diff --git a/frontend/src/routes/users/[id]/+page.server.ts b/frontend/src/routes/users/[id]/+page.server.ts
index 10c3291c..521dbbdd 100644
--- a/frontend/src/routes/users/[id]/+page.server.ts
+++ b/frontend/src/routes/users/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error } from '@sveltejs/kit';
 import type { PageServerLoad } from './$types';
-import { createApiClient } from '$lib/api.server';
-import { getErrorMessage } from '$lib/errors';
+import { createApiClient } from '$lib/shared/api.server';
+import { getErrorMessage } from '$lib/shared/errors';
 
 export const load: PageServerLoad = async ({ params, fetch }) => {
 	const api = createApiClient(fetch);
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 1405f48f..722a0d89 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -46,9 +46,17 @@ export default defineConfig({
 		coverage: {
 			provider: 'v8',
 			reporter: ['text', 'lcov'],
-			// Measure utility and server-side logic only — Svelte components
-			// run in the browser project and are excluded here intentionally.
-			include: ['src/lib/utils/**', 'src/lib/server/**'],
+			// Measure utility and server-side logic only. Svelte components run
+			// in the browser project and are excluded here. Browser-only TS files
+			// (actions, hooks, domain-specific UI state) are also excluded.
+			// person/ is excluded until relationshipLabels.ts coverage is raised.
+			include: [
+				'src/lib/shared/utils/**',
+				'src/lib/shared/server/**',
+				'src/lib/shared/discussion/**',
+				'src/lib/document/**'
+			],
+			exclude: ['**/*.svelte', '**/*.svelte.ts', '**/__mocks__/**'],
 			thresholds: {
 				branches: 80
 			}