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/lib/document/DashboardNeedsMetadata.svelte b/frontend/src/lib/document/DashboardNeedsMetadata.svelte
index 79303308..9bcf1c72 100644
--- a/frontend/src/lib/document/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/document/DocumentMetadataDrawer.svelte b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
index 0fee9b08..01ecc62a 100644
--- a/frontend/src/lib/document/DocumentMetadataDrawer.svelte
+++ b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
@@ -3,7 +3,7 @@ import { m } from '$lib/paraglide/messages.js';
 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/RelationshipPill.svelte';
+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/document/annotation/AnnotationEditOverlay.svelte b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte
index d4da250e..1f967e60 100644
--- a/frontend/src/lib/document/annotation/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/document/annotation/AnnotationEditOverlay.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationEditOverlay.svelte.test.ts
index 61ab18d6..8dc502e3 100644
--- a/frontend/src/lib/document/annotation/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/document/annotation/AnnotationLayer.svelte b/frontend/src/lib/document/annotation/AnnotationLayer.svelte
index 129fef36..d392628c 100644
--- a/frontend/src/lib/document/annotation/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/document/annotation/AnnotationLayer.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationLayer.svelte.test.ts
index 5c78f3a2..ce69a890 100644
--- a/frontend/src/lib/document/annotation/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/document/annotation/AnnotationShape.svelte b/frontend/src/lib/document/annotation/AnnotationShape.svelte
index 31be34f4..8bfc7c7b 100644
--- a/frontend/src/lib/document/annotation/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/document/annotation/AnnotationShape.svelte.test.ts b/frontend/src/lib/document/annotation/AnnotationShape.svelte.test.ts
index f5ad754e..6bfa387c 100644
--- a/frontend/src/lib/document/annotation/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/document/transcription/TranscriptionBlock.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
index 6a5ead9d..d6e2dd87 100644
--- a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
@@ -3,7 +3,7 @@ import { m } from '$lib/paraglide/messages.js';
 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/types';
+import type { PersonMention } from '$lib/shared/types';
 
 const { confirm } = getConfirmService();
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
index 0c28cce0..52cd0acb 100644
--- a/frontend/src/lib/document/transcription/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/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/document/transcription/TranscriptionEditView.svelte b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
index 258fc1dd..b9aecafe 100644
--- a/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte
@@ -3,7 +3,7 @@ import { m } from '$lib/paraglide/messages.js';
 import TranscriptionBlock from './TranscriptionBlock.svelte';
 import OcrTrigger from '$lib/ocr/OcrTrigger.svelte';
 import TranscribeCoachEmptyState from '$lib/shared/help/TranscribeCoachEmptyState.svelte';
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
 import { createBlockAutoSave } from '$lib/document/transcription/useBlockAutoSave.svelte';
 import { createBlockDragDrop } from '$lib/document/transcription/useBlockDragDrop.svelte';
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
index 649d799a..a7c91784 100644
--- a/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionPanelHeader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { getLocale } from '$lib/paraglide/runtime.js';
-import HelpPopover from '$lib/shared/help/HelpPopover.svelte';
+import HelpPopover from '$lib/shared/primitives/HelpPopover.svelte';
 
 type Props = {
 	mode: 'read' | 'edit';
diff --git a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
index 7e82ba46..c6e82711 100644
--- a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
@@ -1,5 +1,5 @@
 <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/document/transcription/transcriptionMarkers';
 import {
diff --git a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.spec.ts
index fbd121c4..9d04319d 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/TranscriptionReadView.svelte.test.ts b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte.test.ts
index 31e62d47..ce9f2985 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/blockConflictMerge.spec.ts b/frontend/src/lib/document/transcription/blockConflictMerge.spec.ts
index e10b245d..8af389bd 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/blockConflictMerge.ts b/frontend/src/lib/document/transcription/blockConflictMerge.ts
index 7077d6c9..ce0a5ca1 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/saveBlockWithConflictRetry.spec.ts b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.spec.ts
index cc808c7d..db7b7d6a 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/saveBlockWithConflictRetry.ts b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
index 44263bf1..9f4ad14b 100644
--- a/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
+++ b/frontend/src/lib/document/transcription/saveBlockWithConflictRetry.ts
@@ -1,4 +1,4 @@
-import type { PersonMention, TranscriptionBlockData } from '$lib/types';
+import type { PersonMention, TranscriptionBlockData } from '$lib/shared/types';
 import {
 	BlockConflictResolvedError,
 	mergeBlockOnConflict
diff --git a/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
index 90f95831..a77d3dcc 100644
--- a/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
+++ b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.test.ts
@@ -1,5 +1,5 @@
 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>>();
diff --git a/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.ts b/frontend/src/lib/document/transcription/useBlockAutoSave.svelte.ts
index 21de5442..4e538fbc 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/useBlockDragDrop.svelte.test.ts b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.test.ts
index 93b59862..2b756e4d 100644
--- a/frontend/src/lib/document/transcription/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 type { TranscriptionBlockData } from '$lib/shared/types';
 
 function makeBlock(id: string, sortOrder: number): TranscriptionBlockData {
 	return {
diff --git a/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.ts b/frontend/src/lib/document/transcription/useBlockDragDrop.svelte.ts
index 176bd467..900c5d1c 100644
--- a/frontend/src/lib/document/transcription/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/document/viewer/PdfViewer.svelte b/frontend/src/lib/document/viewer/PdfViewer.svelte
index ecf8c971..5b23911f 100644
--- a/frontend/src/lib/document/viewer/PdfViewer.svelte
+++ b/frontend/src/lib/document/viewer/PdfViewer.svelte
@@ -3,9 +3,9 @@ import { onMount, setContext } from 'svelte';
 import { createPdfRenderer } from '$lib/document/viewer/usePdfRenderer.svelte';
 import PdfControls from './PdfControls.svelte';
 import AnnotationLayer from '$lib/document/annotation/AnnotationLayer.svelte';
-import type { Annotation } from '$lib/types';
+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/person/StammbaumCard.svelte b/frontend/src/lib/person/genealogy/StammbaumCard.svelte
similarity index 96%
rename from frontend/src/lib/person/StammbaumCard.svelte
rename to frontend/src/lib/person/genealogy/StammbaumCard.svelte
index 9cc3768a..02542f39 100644
--- a/frontend/src/lib/person/StammbaumCard.svelte
+++ b/frontend/src/lib/person/genealogy/StammbaumCard.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import RelationshipChip from '$lib/person/RelationshipChip.svelte';
-import AddRelationshipForm from '$lib/person/AddRelationshipForm.svelte';
+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';
 
diff --git a/frontend/src/lib/person/StammbaumCard.svelte.spec.ts b/frontend/src/lib/person/genealogy/StammbaumCard.svelte.spec.ts
similarity index 90%
rename from frontend/src/lib/person/StammbaumCard.svelte.spec.ts
rename to frontend/src/lib/person/genealogy/StammbaumCard.svelte.spec.ts
index 3cdf7a1d..f2f98284 100644
--- a/frontend/src/lib/person/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/person/RelationshipChip.svelte', () => ({ default: () => null }));
-vi.mock('$lib/person/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/person/StammbaumSidePanel.svelte b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
similarity index 96%
rename from frontend/src/lib/person/StammbaumSidePanel.svelte
rename to frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
index 79bea39d..c243de71 100644
--- a/frontend/src/lib/person/StammbaumSidePanel.svelte
+++ b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte
@@ -3,8 +3,8 @@ import { onMount } from 'svelte';
 import { invalidateAll } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
-import AddRelationshipForm from '$lib/person/AddRelationshipForm.svelte';
-import type { RelFormData } from '$lib/person/AddRelationshipForm.svelte';
+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/person/StammbaumSidePanel.svelte.spec.ts b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/person/StammbaumSidePanel.svelte.spec.ts
rename to frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts
diff --git a/frontend/src/lib/person/StammbaumTree.svelte b/frontend/src/lib/person/genealogy/StammbaumTree.svelte
similarity index 100%
rename from frontend/src/lib/person/StammbaumTree.svelte
rename to frontend/src/lib/person/genealogy/StammbaumTree.svelte
diff --git a/frontend/src/lib/person/StammbaumTree.svelte.test.ts b/frontend/src/lib/person/genealogy/StammbaumTree.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/person/StammbaumTree.svelte.test.ts
rename to frontend/src/lib/person/genealogy/StammbaumTree.svelte.test.ts
diff --git a/frontend/src/lib/person/AddRelationshipForm.svelte b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte
similarity index 100%
rename from frontend/src/lib/person/AddRelationshipForm.svelte
rename to frontend/src/lib/person/relationship/AddRelationshipForm.svelte
diff --git a/frontend/src/lib/person/AddRelationshipForm.svelte.spec.ts b/frontend/src/lib/person/relationship/AddRelationshipForm.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/person/AddRelationshipForm.svelte.spec.ts
rename to frontend/src/lib/person/relationship/AddRelationshipForm.svelte.spec.ts
diff --git a/frontend/src/lib/person/RelationshipChip.svelte b/frontend/src/lib/person/relationship/RelationshipChip.svelte
similarity index 100%
rename from frontend/src/lib/person/RelationshipChip.svelte
rename to frontend/src/lib/person/relationship/RelationshipChip.svelte
diff --git a/frontend/src/lib/person/RelationshipChip.svelte.spec.ts b/frontend/src/lib/person/relationship/RelationshipChip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/person/RelationshipChip.svelte.spec.ts
rename to frontend/src/lib/person/relationship/RelationshipChip.svelte.spec.ts
diff --git a/frontend/src/lib/person/RelationshipPill.svelte b/frontend/src/lib/person/relationship/RelationshipPill.svelte
similarity index 100%
rename from frontend/src/lib/person/RelationshipPill.svelte
rename to frontend/src/lib/person/relationship/RelationshipPill.svelte
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/shared/discussion/CommentMessage.svelte b/frontend/src/lib/shared/discussion/CommentMessage.svelte
index b6089d0a..b0b22017 100644
--- a/frontend/src/lib/shared/discussion/CommentMessage.svelte
+++ b/frontend/src/lib/shared/discussion/CommentMessage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import type { FlatMessage } from '$lib/types';
+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';
diff --git a/frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentMessage.svelte.spec.ts
index c00c272a..d0f85fda 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/CommentThread.svelte b/frontend/src/lib/shared/discussion/CommentThread.svelte
index a7182b01..bdd9c3c9 100644
--- a/frontend/src/lib/shared/discussion/CommentThread.svelte
+++ b/frontend/src/lib/shared/discussion/CommentThread.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onMount, untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import type { Comment, FlatMessage, MentionDTO } from '$lib/types';
+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';
diff --git a/frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts b/frontend/src/lib/shared/discussion/CommentThread.svelte.spec.ts
index a444a7ce..16996980 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/MentionEditor.svelte b/frontend/src/lib/shared/discussion/MentionEditor.svelte
index d7e6a172..544657a4 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/mention';
-import type { MentionDTO } from '$lib/types';
+import type { MentionDTO } from '$lib/shared/types';
 import { m } from '$lib/paraglide/messages.js';
 
 type Props = {
diff --git a/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
index a1b4bdf8..6c7e0941 100644
--- a/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
+++ b/frontend/src/lib/shared/discussion/PersonMentionEditor.svelte
@@ -5,7 +5,7 @@ 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 type { PersonMention } from '$lib/shared/types';
 import { deserialize, serialize } from '$lib/shared/discussion/mentionSerializer';
 import MentionDropdown from './MentionDropdown.svelte';
 
diff --git a/frontend/src/lib/shared/discussion/mention.spec.ts b/frontend/src/lib/shared/discussion/mention.spec.ts
index 0323bf20..f063ab3b 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/mention.ts b/frontend/src/lib/shared/discussion/mention.ts
index 27451c4d..e6d57906 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/mentionSerializer.spec.ts b/frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
index 19b4c4a2..8c07241e 100644
--- a/frontend/src/lib/shared/discussion/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/shared/discussion/mentionSerializer.ts b/frontend/src/lib/shared/discussion/mentionSerializer.ts
index b6213f25..34648b8d 100644
--- a/frontend/src/lib/shared/discussion/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/shared/help/HelpPopover.svelte b/frontend/src/lib/shared/primitives/HelpPopover.svelte
similarity index 100%
rename from frontend/src/lib/shared/help/HelpPopover.svelte
rename to frontend/src/lib/shared/primitives/HelpPopover.svelte
diff --git a/frontend/src/lib/shared/help/HelpPopover.svelte.spec.ts b/frontend/src/lib/shared/primitives/HelpPopover.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/shared/help/HelpPopover.svelte.spec.ts
rename to frontend/src/lib/shared/primitives/HelpPopover.svelte.spec.ts
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/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/utils.ts b/frontend/src/lib/shared/utils.ts
similarity index 100%
rename from frontend/src/lib/utils.ts
rename to frontend/src/lib/shared/utils.ts
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/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/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.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/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/[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.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.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.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/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/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/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.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/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 f0686fba..4a5e0616 100644
--- a/frontend/src/routes/documents/+page.svelte
+++ b/frontend/src/routes/documents/+page.svelte
@@ -8,7 +8,7 @@ import DocumentList from '../DocumentList.svelte';
 import Pagination from '$lib/shared/primitives/Pagination.svelte';
 import BulkSelectionBar from '$lib/document/BulkSelectionBar.svelte';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
-import { getErrorMessage, parseBackendError } from '$lib/errors';
+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 82e53574..478d70ef 100644
--- a/frontend/src/routes/documents/[id]/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/+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 { inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 
 export async function load({ params, fetch }) {
diff --git a/frontend/src/routes/documents/[id]/+page.svelte b/frontend/src/routes/documents/[id]/+page.svelte
index 188d7b83..0c5b6956 100644
--- a/frontend/src/routes/documents/[id]/+page.svelte
+++ b/frontend/src/routes/documents/[id]/+page.svelte
@@ -8,8 +8,8 @@ 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/types';
-import { getErrorMessage } from '$lib/errors';
+import type { TranscriptionBlockData } from '$lib/shared/types';
+import { getErrorMessage } from '$lib/shared/errors';
 import { translateOcrProgress } from '$lib/ocr/translateOcrProgress';
 import { createFileLoader } from '$lib/document/viewer/useFileLoader.svelte';
 import { scrollToCommentFromQuery } from '$lib/shared/utils/deepLinkScroll';
@@ -91,7 +91,7 @@ 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/document/transcription/saveBlockWithConflictRetry');
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]/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 0d69fe07..7138a3d0 100644
--- a/frontend/src/routes/documents/bulk-edit/+page.svelte
+++ b/frontend/src/routes/documents/bulk-edit/+page.svelte
@@ -5,7 +5,7 @@ import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import BulkDocumentEditLayout, {
 	type BulkEditEntry
 } from '$lib/document/BulkDocumentEditLayout.svelte';
-import { getErrorMessage, parseBackendError } from '$lib/errors';
+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/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/[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/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/[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]/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 59cbfa1c..709563bb 100644
--- a/frontend/src/routes/geschichten/[id]/edit/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
@@ -3,7 +3,7 @@ import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
 import BackButton from '$lib/shared/primitives/BackButton.svelte';
-import { getErrorMessage } from '$lib/errors';
+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 0e320023..cf94c1f0 100644
--- a/frontend/src/routes/geschichten/new/+page.svelte
+++ b/frontend/src/routes/geschichten/new/+page.svelte
@@ -3,7 +3,7 @@ import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
 import BackButton from '$lib/shared/primitives/BackButton.svelte';
-import { getErrorMessage } from '$lib/errors';
+import { getErrorMessage } from '$lib/shared/errors';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
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/[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]/edit/+page.server.ts b/frontend/src/routes/persons/[id]/edit/+page.server.ts
index 2d94c619..d42e2c1a 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/edit/+page.server.ts
@@ -1,6 +1,6 @@
 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,
diff --git a/frontend/src/routes/persons/[id]/edit/+page.svelte b/frontend/src/routes/persons/[id]/edit/+page.svelte
index 438ce760..9d2124da 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.svelte
+++ b/frontend/src/routes/persons/[id]/edit/+page.svelte
@@ -6,7 +6,7 @@ import PersonEditForm from './PersonEditForm.svelte';
 import PersonEditSaveBar from './PersonEditSaveBar.svelte';
 import NameHistoryEditCard from './NameHistoryEditCard.svelte';
 import PersonMergePanel from '../PersonMergePanel.svelte';
-import StammbaumCard from '$lib/person/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]/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 3ed6619a..8dff7899 100644
--- a/frontend/src/routes/persons/new/+page.server.ts
+++ b/frontend/src/routes/persons/new/+page.server.ts
@@ -1,6 +1,6 @@
 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,
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/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 1e6da74d..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/person/StammbaumTree.svelte';
-import StammbaumSidePanel from '$lib/person/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..8f3df7b6 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -48,7 +48,7 @@ export default defineConfig({
 			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/**'],
+			include: ['src/lib/shared/**', 'src/lib/document/**', 'src/lib/person/**'],
 			thresholds: {
 				branches: 80
 			}