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/activity/ChronikFuerDichBox.svelte b/frontend/src/lib/activity/ChronikFuerDichBox.svelte
index aec6ebe9..14a440f1 100644
--- a/frontend/src/lib/activity/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 { relativeTime } from '$lib/shared/utils/time';
 import type { NotificationItem } from '$lib/notification/notifications.svelte';
-import { buildCommentHref } from '$lib/utils/commentDeepLink';
+import { buildCommentHref } from '$lib/shared/discussion/commentDeepLink';
 
 interface Props {
 	unread: NotificationItem[];
diff --git a/frontend/src/lib/activity/ChronikRow.svelte b/frontend/src/lib/activity/ChronikRow.svelte
index b752a93a..a324066e 100644
--- a/frontend/src/lib/activity/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/activity/ChronikTimeline.svelte b/frontend/src/lib/activity/ChronikTimeline.svelte
index 1675b719..5892bf65 100644
--- a/frontend/src/lib/activity/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/CommentMessage.svelte b/frontend/src/lib/components/CommentMessage.svelte
index f66c508c..b6089d0a 100644
--- a/frontend/src/lib/components/CommentMessage.svelte
+++ b/frontend/src/lib/components/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 { 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/CommentThread.svelte b/frontend/src/lib/components/CommentThread.svelte
index f943c671..c8b045b6 100644
--- a/frontend/src/lib/components/CommentThread.svelte
+++ b/frontend/src/lib/components/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 type { Comment, FlatMessage, MentionDTO } from '$lib/types';
 import MentionEditor from '$lib/components/MentionEditor.svelte';
 import CommentMessage from '$lib/components/CommentMessage.svelte';
-import { extractContent } from '$lib/utils/mention';
+import { extractContent } from '$lib/shared/discussion/mention';
 type Props = {
 	documentId: string;
 	annotationId?: string | null;
diff --git a/frontend/src/lib/components/ConfirmDialog.svelte b/frontend/src/lib/components/ConfirmDialog.svelte
index eafea0da..1fb1abd5 100644
--- a/frontend/src/lib/components/ConfirmDialog.svelte
+++ b/frontend/src/lib/components/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/components/ConfirmDialog.svelte.spec.ts
index 9868a06d..6ed874d7 100644
--- a/frontend/src/lib/components/ConfirmDialog.svelte.spec.ts
+++ b/frontend/src/lib/components/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/DateInput.svelte b/frontend/src/lib/components/DateInput.svelte
index 2ee7acc4..08fed63a 100644
--- a/frontend/src/lib/components/DateInput.svelte
+++ b/frontend/src/lib/components/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/MentionDropdown.svelte b/frontend/src/lib/components/MentionDropdown.svelte
index 6a95b233..0230564e 100644
--- a/frontend/src/lib/components/MentionDropdown.svelte
+++ b/frontend/src/lib/components/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/components/MentionEditor.svelte
index 52b1ac74..d7e6a172 100644
--- a/frontend/src/lib/components/MentionEditor.svelte
+++ b/frontend/src/lib/components/MentionEditor.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { onDestroy, tick } from 'svelte';
-import { detectMention } from '$lib/utils/mention';
+import { detectMention } from '$lib/shared/discussion/mention';
 import type { MentionDTO } from '$lib/types';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/lib/components/OverflowPillButton.svelte b/frontend/src/lib/components/OverflowPillButton.svelte
index 3661b5c4..7795c0f2 100644
--- a/frontend/src/lib/components/OverflowPillButton.svelte
+++ b/frontend/src/lib/components/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/PersonMentionEditor.svelte b/frontend/src/lib/components/PersonMentionEditor.svelte
index aa2643b4..a1b4bdf8 100644
--- a/frontend/src/lib/components/PersonMentionEditor.svelte
+++ b/frontend/src/lib/components/PersonMentionEditor.svelte
@@ -6,7 +6,7 @@ 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 { deserialize, serialize } from '$lib/shared/discussion/mentionSerializer';
 import MentionDropdown from './MentionDropdown.svelte';
 
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/document/BulkDocumentEditLayout.svelte b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
index 316e81a8..b2623140 100644
--- a/frontend/src/lib/document/BulkDocumentEditLayout.svelte
+++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
@@ -3,8 +3,8 @@ 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 { 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';
diff --git a/frontend/src/lib/document/DocumentEditLayout.svelte b/frontend/src/lib/document/DocumentEditLayout.svelte
index 3dba82b4..52df8248 100644
--- a/frontend/src/lib/document/DocumentEditLayout.svelte
+++ b/frontend/src/lib/document/DocumentEditLayout.svelte
@@ -5,7 +5,7 @@ import { onMount, onDestroy, untrack } from 'svelte';
 import type { Snippet } from 'svelte';
 import { createFileLoader } from '$lib/document/viewer/useFileLoader.svelte';
 import { m } from '$lib/paraglide/messages.js';
-import { countRequiredFilled } from '$lib/utils/requiredFields';
+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';
diff --git a/frontend/src/lib/document/DocumentMetadataDrawer.svelte b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
index d6895629..0fee9b08 100644
--- a/frontend/src/lib/document/DocumentMetadataDrawer.svelte
+++ b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { formatDate } from '$lib/utils/date';
+import { formatDate } from '$lib/shared/utils/date';
 import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
-import { getInitials, personAvatarColor } from '$lib/utils/personFormat';
+import { getInitials, personAvatarColor } from '$lib/person/personFormat';
 import RelationshipPill from '$lib/person/RelationshipPill.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
diff --git a/frontend/src/lib/document/DocumentMultiSelect.svelte b/frontend/src/lib/document/DocumentMultiSelect.svelte
index cdef1d62..4dabda60 100644
--- a/frontend/src/lib/document/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/document/DocumentRow.svelte b/frontend/src/lib/document/DocumentRow.svelte
index ca5d3ce6..5c1763fd 100644
--- a/frontend/src/lib/document/DocumentRow.svelte
+++ b/frontend/src/lib/document/DocumentRow.svelte
@@ -2,7 +2,7 @@
 import { goto } from '$app/navigation';
 import type { components } from '$lib/generated/api';
 import { applyOffsets } from '$lib/document/search';
-import { formatDate } from '$lib/utils/date';
+import { formatDate } from '$lib/shared/utils/date';
 import * as m from '$lib/paraglide/messages.js';
 import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte';
 import ProgressRing from '$lib/components/ProgressRing.svelte';
diff --git a/frontend/src/lib/document/DocumentStatusChip.svelte b/frontend/src/lib/document/DocumentStatusChip.svelte
index 05857ebc..ce4fa919 100644
--- a/frontend/src/lib/document/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/document/DocumentTopBar.svelte b/frontend/src/lib/document/DocumentTopBar.svelte
index 6a694021..023cf82f 100644
--- a/frontend/src/lib/document/DocumentTopBar.svelte
+++ b/frontend/src/lib/document/DocumentTopBar.svelte
@@ -1,8 +1,8 @@
 <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 { formatDate } from '$lib/shared/utils/date';
+import { clickOutside } from '$lib/shared/actions/clickOutside';
 import PersonChipRow from '$lib/person/PersonChipRow.svelte';
 import OverflowPillButton from '$lib/components/OverflowPillButton.svelte';
 import DocumentMetadataDrawer from './DocumentMetadataDrawer.svelte';
diff --git a/frontend/src/lib/document/ReadyColumn.svelte b/frontend/src/lib/document/ReadyColumn.svelte
index 50ab73bb..3f8ce38b 100644
--- a/frontend/src/lib/document/ReadyColumn.svelte
+++ b/frontend/src/lib/document/ReadyColumn.svelte
@@ -1,7 +1,7 @@
 <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 '$lib/components/ContributorStack.svelte';
 
diff --git a/frontend/src/lib/document/SegmentationColumn.svelte b/frontend/src/lib/document/SegmentationColumn.svelte
index e7eb7be8..9de941f3 100644
--- a/frontend/src/lib/document/SegmentationColumn.svelte
+++ b/frontend/src/lib/document/SegmentationColumn.svelte
@@ -1,7 +1,7 @@
 <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 '$lib/components/ContributorStack.svelte';
 
diff --git a/frontend/src/lib/document/ThumbnailRow.svelte b/frontend/src/lib/document/ThumbnailRow.svelte
index 1a532e1e..a5255112 100644
--- a/frontend/src/lib/document/ThumbnailRow.svelte
+++ b/frontend/src/lib/document/ThumbnailRow.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import ConversationThumbnail from '$lib/conversation/ConversationThumbnail.svelte';
 import TagChipList from '$lib/tag/TagChipList.svelte';
-import { formatDate } from '$lib/utils/date';
+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/document/WhoWhenSection.svelte b/frontend/src/lib/document/WhoWhenSection.svelte
index ce562014..1bda0cab 100644
--- a/frontend/src/lib/document/WhoWhenSection.svelte
+++ b/frontend/src/lib/document/WhoWhenSection.svelte
@@ -3,7 +3,7 @@ import { onMount, untrack } from '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/document/filename.ts b/frontend/src/lib/document/filename.ts
index 12769cc4..d6fb8ed0 100644
--- a/frontend/src/lib/document/filename.ts
+++ b/frontend/src/lib/document/filename.ts
@@ -1,4 +1,4 @@
-import { isoToGerman } from '$lib/utils/date';
+import { isoToGerman } from '$lib/shared/utils/date';
 
 export interface FilenameParseResult {
 	/** ISO format: YYYY-MM-DD */
diff --git a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
index 5441fe57..a55c0d5c 100644
--- a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 import CommentThread from '$lib/components/CommentThread.svelte';
 import PersonMentionEditor from '$lib/components/PersonMentionEditor.svelte';
 import type { PersonMention } from '$lib/types';
diff --git a/frontend/src/lib/document/transcription/TranscriptionBlock.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionBlock.svelte.spec.ts
index 85961e75..a9b11698 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/TranscriptionBlock.test-host.svelte b/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
index d2e2055d..0c28cce0 100644
--- a/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionBlock.test-host.svelte
@@ -1,5 +1,5 @@
 <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';
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionColumn.svelte b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
index 5f3f38b7..5f448586 100644
--- a/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionColumn.svelte
@@ -1,7 +1,7 @@
 <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 '$lib/components/ContributorStack.svelte';
 
diff --git a/frontend/src/lib/document/transcription/TranscriptionEditView.svelte.spec.ts b/frontend/src/lib/document/transcription/TranscriptionEditView.svelte.spec.ts
index 39bf098c..701cb288 100644
--- a/frontend/src/lib/document/transcription/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/document/transcription/TranscriptionReadView.svelte b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
index f23067dd..7e82ba46 100644
--- a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
@@ -6,10 +6,10 @@ import {
 	renderTranscriptionBody,
 	type SafeHtml,
 	PERSON_MENTION_SELECTOR
-} from '$lib/utils/mention';
-import { computeHoverCardPosition } from '$lib/utils/hoverCardPosition';
+} 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/types/personHoverCard';
+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/geschichte/GeschichtenCard.svelte b/frontend/src/lib/geschichte/GeschichtenCard.svelte
index e5d840f5..2fec7b39 100644
--- a/frontend/src/lib/geschichte/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/notification/NotificationBell.svelte b/frontend/src/lib/notification/NotificationBell.svelte
index 95940637..3648f95f 100644
--- a/frontend/src/lib/notification/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 { clickOutside } from '$lib/shared/actions/clickOutside';
 import { notificationStore } from '$lib/notification/notifications.svelte';
-import { buildCommentHref } from '$lib/utils/commentDeepLink';
+import { buildCommentHref } from '$lib/shared/discussion/commentDeepLink';
 import NotificationDropdown from './NotificationDropdown.svelte';
 
 let open = $state(false);
diff --git a/frontend/src/lib/notification/NotificationDropdown.svelte b/frontend/src/lib/notification/NotificationDropdown.svelte
index 31babcd4..c94f0a10 100644
--- a/frontend/src/lib/notification/NotificationDropdown.svelte
+++ b/frontend/src/lib/notification/NotificationDropdown.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { relativeTime } from '$lib/utils/time';
+import { relativeTime } from '$lib/shared/utils/time';
 import type { NotificationItem } from '$lib/notification/notifications.svelte';
 
 type Props = {
diff --git a/frontend/src/lib/notification/notifications.ts b/frontend/src/lib/notification/notifications.ts
index a4feb005..57784d8f 100644
--- a/frontend/src/lib/notification/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/ocr/OcrTrainingCard.svelte b/frontend/src/lib/ocr/OcrTrainingCard.svelte
index 77a62a94..3bb8eb6c 100644
--- a/frontend/src/lib/ocr/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/ocr/SegmentationTrainingCard.svelte b/frontend/src/lib/ocr/SegmentationTrainingCard.svelte
index eba98409..cfd9c478 100644
--- a/frontend/src/lib/ocr/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/ocr/TrainingHistory.svelte b/frontend/src/lib/ocr/TrainingHistory.svelte
index 4e830c07..7c4dd4b4 100644
--- a/frontend/src/lib/ocr/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/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/person/PersonChip.svelte b/frontend/src/lib/person/PersonChip.svelte
index 89dd502a..e9a535e8 100644
--- a/frontend/src/lib/person/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/person/PersonHoverCard.svelte b/frontend/src/lib/person/PersonHoverCard.svelte
index 4aae22f1..934bfd3e 100644
--- a/frontend/src/lib/person/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 { 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/person/PersonMultiSelect.svelte b/frontend/src/lib/person/PersonMultiSelect.svelte
index 6ff453c9..80a4e97b 100644
--- a/frontend/src/lib/person/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/person/PersonTypeSelector.svelte b/frontend/src/lib/person/PersonTypeSelector.svelte
index c8d3784b..d38f758b 100644
--- a/frontend/src/lib/person/PersonTypeSelector.svelte
+++ b/frontend/src/lib/person/PersonTypeSelector.svelte
@@ -1,6 +1,6 @@
 <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/person-validation';
 
diff --git a/frontend/src/lib/person/PersonTypeahead.svelte b/frontend/src/lib/person/PersonTypeahead.svelte
index 1ac3473e..dd3b25ea 100644
--- a/frontend/src/lib/person/PersonTypeahead.svelte
+++ b/frontend/src/lib/person/PersonTypeahead.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';
 import FieldLabelBadge from '$lib/document/FieldLabelBadge.svelte';
 type Person = components['schemas']['Person'];
 
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 98%
rename from frontend/src/lib/utils/personFormat.ts
rename to frontend/src/lib/person/personFormat.ts
index 7b08ae0a..9a538d26 100644
--- a/frontend/src/lib/utils/personFormat.ts
+++ b/frontend/src/lib/person/personFormat.ts
@@ -1,5 +1,5 @@
 import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
-import { formatDate } from './date';
+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/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/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 100%
rename from frontend/src/lib/utils/mention.spec.ts
rename to frontend/src/lib/shared/discussion/mention.spec.ts
diff --git a/frontend/src/lib/utils/mention.ts b/frontend/src/lib/shared/discussion/mention.ts
similarity index 100%
rename from frontend/src/lib/utils/mention.ts
rename to frontend/src/lib/shared/discussion/mention.ts
diff --git a/frontend/src/lib/utils/mentionSerializer.spec.ts b/frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
similarity index 100%
rename from frontend/src/lib/utils/mentionSerializer.spec.ts
rename to frontend/src/lib/shared/discussion/mentionSerializer.spec.ts
diff --git a/frontend/src/lib/utils/mentionSerializer.ts b/frontend/src/lib/shared/discussion/mentionSerializer.ts
similarity index 100%
rename from frontend/src/lib/utils/mentionSerializer.ts
rename to frontend/src/lib/shared/discussion/mentionSerializer.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 100%
rename from frontend/src/lib/hooks/__tests__/useTypeahead.svelte.test.ts
rename to frontend/src/lib/shared/hooks/useTypeahead.svelte.test.ts
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 100%
rename from frontend/src/lib/hooks/__tests__/useUnsavedWarning.svelte.test.ts
rename to frontend/src/lib/shared/hooks/useUnsavedWarning.svelte.test.ts
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/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 100%
rename from frontend/src/lib/services/confirm.test-host.svelte
rename to frontend/src/lib/shared/services/confirm.test-host.svelte
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/tag/TagInput.svelte b/frontend/src/lib/tag/TagInput.svelte
index 0442869c..82669b80 100644
--- a/frontend/src/lib/tag/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/tag/TagParentPicker.svelte b/frontend/src/lib/tag/TagParentPicker.svelte
index 152fb4b2..61472485 100644
--- a/frontend/src/lib/tag/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/user/UserProfileSection.svelte b/frontend/src/lib/user/UserProfileSection.svelte
index 1efd502a..dea8a9f3 100644
--- a/frontend/src/lib/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
index 51ca79f9..490b94d8 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -1 +1 @@
-export { isoToGerman, germanToIso } from '$lib/utils/date';
+export { isoToGerman, germanToIso } from '$lib/shared/utils/date';
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index c282e75f..d0539c96 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -9,7 +9,7 @@ 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 { 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/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/groups/[id]/+page.svelte b/frontend/src/routes/admin/groups/[id]/+page.svelte
index 9b9a3574..a2c6877f 100644
--- a/frontend/src/routes/admin/groups/[id]/+page.svelte
+++ b/frontend/src/routes/admin/groups/[id]/+page.svelte
@@ -1,8 +1,8 @@
 <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 { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
+import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
 import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
 
 let { data, form } = $props();
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/tags/[id]/+page.svelte b/frontend/src/routes/admin/tags/[id]/+page.svelte
index b5da8219..59b34137 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.svelte
+++ b/frontend/src/routes/admin/tags/[id]/+page.svelte
@@ -3,7 +3,7 @@ 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 { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
 import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
 import TagParentPicker from '$lib/tag/TagParentPicker.svelte';
 import TagAncestry from './TagAncestry.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]/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/users/[id]/+page.svelte b/frontend/src/routes/admin/users/[id]/+page.svelte
index 2e015809..1870b109 100644
--- a/frontend/src/routes/admin/users/[id]/+page.svelte
+++ b/frontend/src/routes/admin/users/[id]/+page.svelte
@@ -1,11 +1,11 @@
 <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';
 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/hooks/useUnsavedWarning.svelte';
+import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
 import UnsavedWarningBanner from '$lib/components/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/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/documents/[id]/+page.svelte b/frontend/src/routes/documents/[id]/+page.svelte
index 3e88b95a..188d7b83 100644
--- a/frontend/src/routes/documents/[id]/+page.svelte
+++ b/frontend/src/routes/documents/[id]/+page.svelte
@@ -12,8 +12,8 @@ import type { TranscriptionBlockData } from '$lib/types';
 import { getErrorMessage } from '$lib/errors';
 import { translateOcrProgress } from '$lib/ocr/translateOcrProgress';
 import { createFileLoader } from '$lib/document/viewer/useFileLoader.svelte';
-import { scrollToCommentFromQuery } from '$lib/utils/deepLinkScroll';
-import { getConfirmService } from '$lib/services/confirm.svelte.js';
+import { scrollToCommentFromQuery } from '$lib/shared/utils/deepLinkScroll';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte.js';
 
 let { data } = $props();
 
diff --git a/frontend/src/routes/documents/[id]/edit/+page.svelte b/frontend/src/routes/documents/[id]/edit/+page.svelte
index 6aceaca8..14f874dd 100644
--- a/frontend/src/routes/documents/[id]/edit/+page.svelte
+++ b/frontend/src/routes/documents/[id]/edit/+page.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';
 import BackButton from '$lib/components/BackButton.svelte';
 import DocumentEditLayout from '$lib/document/DocumentEditLayout.svelte';
 
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/geschichten/+page.svelte b/frontend/src/routes/geschichten/+page.svelte
index a45958fa..7ced4ade 100644
--- a/frontend/src/routes/geschichten/+page.svelte
+++ b/frontend/src/routes/geschichten/+page.svelte
@@ -1,8 +1,8 @@
 <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 { 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';
 
diff --git a/frontend/src/routes/geschichten/[id]/+page.svelte b/frontend/src/routes/geschichten/[id]/+page.svelte
index f7ba5541..0d26453b 100644
--- a/frontend/src/routes/geschichten/[id]/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/+page.svelte
@@ -1,9 +1,9 @@
 <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 { safeHtml } from '$lib/shared/utils/sanitize';
+import { formatDate } from '$lib/shared/utils/date';
+import { getConfirmService } from '$lib/shared/services/confirm.svelte';
 import BackButton from '$lib/components/BackButton.svelte';
 import type { PageData } from './$types';
 
diff --git a/frontend/src/routes/persons/+page.svelte b/frontend/src/routes/persons/+page.svelte
index a824a84e..5522d3ad 100644
--- a/frontend/src/routes/persons/+page.svelte
+++ b/frontend/src/routes/persons/+page.svelte
@@ -2,7 +2,7 @@
 import { goto } from '$app/navigation';
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
+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]/PersonCard.svelte b/frontend/src/routes/persons/[id]/PersonCard.svelte
index a277a360..b829f8f5 100644
--- a/frontend/src/routes/persons/[id]/PersonCard.svelte
+++ b/frontend/src/routes/persons/[id]/PersonCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { formatLifeDateRange } from '$lib/utils/personLifeDates';
+import { formatLifeDateRange } from '$lib/person/personLifeDates';
 import PersonTypeBadge from '$lib/person/PersonTypeBadge.svelte';
 
 let {
diff --git a/frontend/src/routes/persons/[id]/PersonDocumentList.svelte b/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
index 85446776..c88b3c9d 100644
--- a/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
+++ b/frontend/src/routes/persons/[id]/PersonDocumentList.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { formatDate } from '$lib/utils/date';
+import { formatDate } from '$lib/shared/utils/date';
 import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
-import { sortDocumentsByDate, type SortDir } from '$lib/utils/sort';
+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]/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/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 {