diff --git a/frontend/src/lib/document/DocumentMetadataDrawer.svelte b/frontend/src/lib/document/DocumentMetadataDrawer.svelte
index a3df7ef3..d6895629 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/utils/date';
 import { formatDocumentStatus } from '$lib/document/documentStatusLabel';
 import { getInitials, personAvatarColor } from '$lib/utils/personFormat';
-import RelationshipPill from '$lib/components/RelationshipPill.svelte';
+import RelationshipPill from '$lib/person/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/DocumentTopBar.svelte b/frontend/src/lib/document/DocumentTopBar.svelte
index dc3c99e0..6a694021 100644
--- a/frontend/src/lib/document/DocumentTopBar.svelte
+++ b/frontend/src/lib/document/DocumentTopBar.svelte
@@ -3,7 +3,7 @@ import { m } from '$lib/paraglide/messages.js';
 import { slide } from 'svelte/transition';
 import { formatDate } from '$lib/utils/date';
 import { clickOutside } from '$lib/actions/clickOutside';
-import PersonChipRow from '$lib/components/PersonChipRow.svelte';
+import PersonChipRow from '$lib/person/PersonChipRow.svelte';
 import OverflowPillButton from '$lib/components/OverflowPillButton.svelte';
 import DocumentMetadataDrawer from './DocumentMetadataDrawer.svelte';
 import BackButton from '$lib/components/BackButton.svelte';
diff --git a/frontend/src/lib/document/WhoWhenSection.svelte b/frontend/src/lib/document/WhoWhenSection.svelte
index 12e47cd2..ce562014 100644
--- a/frontend/src/lib/document/WhoWhenSection.svelte
+++ b/frontend/src/lib/document/WhoWhenSection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onMount, untrack } from 'svelte';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
-import PersonMultiSelect from '$lib/components/PersonMultiSelect.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
+import PersonMultiSelect from '$lib/person/PersonMultiSelect.svelte';
 import FieldLabelBadge from './FieldLabelBadge.svelte';
 import { isoToGerman, handleGermanDateInput } from '$lib/utils/date';
 import { m } from '$lib/paraglide/messages.js';
diff --git a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
index a6c040eb..f23067dd 100644
--- a/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
+++ b/frontend/src/lib/document/transcription/TranscriptionReadView.svelte
@@ -8,7 +8,7 @@ import {
 	PERSON_MENTION_SELECTOR
 } from '$lib/utils/mention';
 import { computeHoverCardPosition } from '$lib/utils/hoverCardPosition';
-import PersonHoverCard from '$lib/components/PersonHoverCard.svelte';
+import PersonHoverCard from '$lib/person/PersonHoverCard.svelte';
 import type { HoverData, LoadState } from '$lib/types/personHoverCard';
 import { goto } from '$app/navigation';
 import { SvelteMap, SvelteSet } from 'svelte/reactivity';
diff --git a/frontend/src/lib/geschichte/GeschichteEditor.svelte b/frontend/src/lib/geschichte/GeschichteEditor.svelte
index 27d3d5d1..1df78c03 100644
--- a/frontend/src/lib/geschichte/GeschichteEditor.svelte
+++ b/frontend/src/lib/geschichte/GeschichteEditor.svelte
@@ -5,7 +5,7 @@ import { Editor } from '@tiptap/core';
 import StarterKit from '@tiptap/starter-kit';
 import { m } from '$lib/paraglide/messages.js';
 import type { components } from '$lib/generated/api';
-import PersonMultiSelect from '$lib/components/PersonMultiSelect.svelte';
+import PersonMultiSelect from '$lib/person/PersonMultiSelect.svelte';
 import DocumentMultiSelect from '$lib/document/DocumentMultiSelect.svelte';
 
 type Geschichte = components['schemas']['Geschichte'];
diff --git a/frontend/src/lib/components/AddRelationshipForm.svelte b/frontend/src/lib/person/AddRelationshipForm.svelte
similarity index 98%
rename from frontend/src/lib/components/AddRelationshipForm.svelte
rename to frontend/src/lib/person/AddRelationshipForm.svelte
index 7c5ee2e4..07fe0e47 100644
--- a/frontend/src/lib/components/AddRelationshipForm.svelte
+++ b/frontend/src/lib/person/AddRelationshipForm.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts b/frontend/src/lib/person/AddRelationshipForm.svelte.spec.ts
similarity index 97%
rename from frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts
rename to frontend/src/lib/person/AddRelationshipForm.svelte.spec.ts
index f542d7de..da9be13d 100644
--- a/frontend/src/lib/components/AddRelationshipForm.svelte.spec.ts
+++ b/frontend/src/lib/person/AddRelationshipForm.svelte.spec.ts
@@ -4,7 +4,7 @@ import { page } from 'vitest/browser';
 import AddRelationshipForm from './AddRelationshipForm.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({ default: () => null }));
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/PersonChip.svelte b/frontend/src/lib/person/PersonChip.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonChip.svelte
rename to frontend/src/lib/person/PersonChip.svelte
diff --git a/frontend/src/lib/components/PersonChipRow.svelte b/frontend/src/lib/person/PersonChipRow.svelte
similarity index 93%
rename from frontend/src/lib/components/PersonChipRow.svelte
rename to frontend/src/lib/person/PersonChipRow.svelte
index d292e22d..2f29ae2f 100644
--- a/frontend/src/lib/components/PersonChipRow.svelte
+++ b/frontend/src/lib/person/PersonChipRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import PersonChip from './PersonChip.svelte';
-import OverflowPillDisplay from './OverflowPillDisplay.svelte';
+import OverflowPillDisplay from '$lib/components/OverflowPillDisplay.svelte';
 
 type Person = { id: string; firstName?: string | null; lastName: string; displayName: string };
 
diff --git a/frontend/src/lib/components/PersonHoverCard.svelte b/frontend/src/lib/person/PersonHoverCard.svelte
similarity index 99%
rename from frontend/src/lib/components/PersonHoverCard.svelte
rename to frontend/src/lib/person/PersonHoverCard.svelte
index 4eecd578..4aae22f1 100644
--- a/frontend/src/lib/components/PersonHoverCard.svelte
+++ b/frontend/src/lib/person/PersonHoverCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import { chipLabel, otherName } from '$lib/relationshipLabels';
+import { chipLabel, otherName } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
 import type { LoadState } from '$lib/types/personHoverCard';
 
diff --git a/frontend/src/lib/components/PersonHoverCard.svelte.spec.ts b/frontend/src/lib/person/PersonHoverCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonHoverCard.svelte.spec.ts
rename to frontend/src/lib/person/PersonHoverCard.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonMultiSelect.svelte b/frontend/src/lib/person/PersonMultiSelect.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonMultiSelect.svelte
rename to frontend/src/lib/person/PersonMultiSelect.svelte
diff --git a/frontend/src/lib/components/PersonMultiSelect.svelte.spec.ts b/frontend/src/lib/person/PersonMultiSelect.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonMultiSelect.svelte.spec.ts
rename to frontend/src/lib/person/PersonMultiSelect.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonTypeBadge.svelte b/frontend/src/lib/person/PersonTypeBadge.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonTypeBadge.svelte
rename to frontend/src/lib/person/PersonTypeBadge.svelte
diff --git a/frontend/src/lib/components/PersonTypeSelector.svelte b/frontend/src/lib/person/PersonTypeSelector.svelte
similarity index 98%
rename from frontend/src/lib/components/PersonTypeSelector.svelte
rename to frontend/src/lib/person/PersonTypeSelector.svelte
index 1d4de750..c8d3784b 100644
--- a/frontend/src/lib/components/PersonTypeSelector.svelte
+++ b/frontend/src/lib/person/PersonTypeSelector.svelte
@@ -2,7 +2,7 @@
 import { untrack } from 'svelte';
 import { radioGroupNav } from '$lib/actions/radioGroupNav';
 import { m } from '$lib/paraglide/messages.js';
-import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person-validation';
+import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person/person-validation';
 
 let {
 	value = 'PERSON',
diff --git a/frontend/src/lib/components/PersonTypeSelector.svelte.spec.ts b/frontend/src/lib/person/PersonTypeSelector.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonTypeSelector.svelte.spec.ts
rename to frontend/src/lib/person/PersonTypeSelector.svelte.spec.ts
diff --git a/frontend/src/lib/components/PersonTypeahead.svelte b/frontend/src/lib/person/PersonTypeahead.svelte
similarity index 100%
rename from frontend/src/lib/components/PersonTypeahead.svelte
rename to frontend/src/lib/person/PersonTypeahead.svelte
diff --git a/frontend/src/lib/components/PersonTypeahead.svelte.spec.ts b/frontend/src/lib/person/PersonTypeahead.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/PersonTypeahead.svelte.spec.ts
rename to frontend/src/lib/person/PersonTypeahead.svelte.spec.ts
diff --git a/frontend/src/lib/components/RelationshipChip.svelte b/frontend/src/lib/person/RelationshipChip.svelte
similarity index 100%
rename from frontend/src/lib/components/RelationshipChip.svelte
rename to frontend/src/lib/person/RelationshipChip.svelte
diff --git a/frontend/src/lib/components/RelationshipChip.svelte.spec.ts b/frontend/src/lib/person/RelationshipChip.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/RelationshipChip.svelte.spec.ts
rename to frontend/src/lib/person/RelationshipChip.svelte.spec.ts
diff --git a/frontend/src/lib/components/RelationshipPill.svelte b/frontend/src/lib/person/RelationshipPill.svelte
similarity index 100%
rename from frontend/src/lib/components/RelationshipPill.svelte
rename to frontend/src/lib/person/RelationshipPill.svelte
diff --git a/frontend/src/lib/components/StammbaumCard.svelte b/frontend/src/lib/person/StammbaumCard.svelte
similarity index 96%
rename from frontend/src/lib/components/StammbaumCard.svelte
rename to frontend/src/lib/person/StammbaumCard.svelte
index 49742ceb..9cc3768a 100644
--- a/frontend/src/lib/components/StammbaumCard.svelte
+++ b/frontend/src/lib/person/StammbaumCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import RelationshipChip from '$lib/components/RelationshipChip.svelte';
-import AddRelationshipForm from '$lib/components/AddRelationshipForm.svelte';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
+import RelationshipChip from '$lib/person/RelationshipChip.svelte';
+import AddRelationshipForm from '$lib/person/AddRelationshipForm.svelte';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/lib/components/StammbaumCard.svelte.spec.ts b/frontend/src/lib/person/StammbaumCard.svelte.spec.ts
similarity index 91%
rename from frontend/src/lib/components/StammbaumCard.svelte.spec.ts
rename to frontend/src/lib/person/StammbaumCard.svelte.spec.ts
index da9271f9..3cdf7a1d 100644
--- a/frontend/src/lib/components/StammbaumCard.svelte.spec.ts
+++ b/frontend/src/lib/person/StammbaumCard.svelte.spec.ts
@@ -4,8 +4,8 @@ import { page } from 'vitest/browser';
 import StammbaumCard from './StammbaumCard.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/RelationshipChip.svelte', () => ({ default: () => null }));
-vi.mock('$lib/components/AddRelationshipForm.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/RelationshipChip.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/AddRelationshipForm.svelte', () => ({ default: () => null }));
 
 afterEach(cleanup);
 
diff --git a/frontend/src/lib/components/StammbaumSidePanel.svelte b/frontend/src/lib/person/StammbaumSidePanel.svelte
similarity index 96%
rename from frontend/src/lib/components/StammbaumSidePanel.svelte
rename to frontend/src/lib/person/StammbaumSidePanel.svelte
index 5ec163ac..79bea39d 100644
--- a/frontend/src/lib/components/StammbaumSidePanel.svelte
+++ b/frontend/src/lib/person/StammbaumSidePanel.svelte
@@ -2,9 +2,9 @@
 import { onMount } from 'svelte';
 import { invalidateAll } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
-import AddRelationshipForm from '$lib/components/AddRelationshipForm.svelte';
-import type { RelFormData } from '$lib/components/AddRelationshipForm.svelte';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
+import AddRelationshipForm from '$lib/person/AddRelationshipForm.svelte';
+import type { RelFormData } from '$lib/person/AddRelationshipForm.svelte';
 import type { components } from '$lib/generated/api';
 
 type PersonNodeDTO = components['schemas']['PersonNodeDTO'];
diff --git a/frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts b/frontend/src/lib/person/StammbaumSidePanel.svelte.spec.ts
similarity index 97%
rename from frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts
rename to frontend/src/lib/person/StammbaumSidePanel.svelte.spec.ts
index 1006367b..4dda616b 100644
--- a/frontend/src/lib/components/StammbaumSidePanel.svelte.spec.ts
+++ b/frontend/src/lib/person/StammbaumSidePanel.svelte.spec.ts
@@ -5,7 +5,7 @@ import StammbaumSidePanel from './StammbaumSidePanel.svelte';
 
 vi.mock('$app/navigation', () => ({ invalidateAll: vi.fn() }));
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({ default: () => null }));
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({ default: () => null }));
 
 const makeNode = () => ({
 	id: 'person-1',
diff --git a/frontend/src/lib/components/StammbaumTree.svelte b/frontend/src/lib/person/StammbaumTree.svelte
similarity index 100%
rename from frontend/src/lib/components/StammbaumTree.svelte
rename to frontend/src/lib/person/StammbaumTree.svelte
diff --git a/frontend/src/lib/components/StammbaumTree.svelte.test.ts b/frontend/src/lib/person/StammbaumTree.svelte.test.ts
similarity index 100%
rename from frontend/src/lib/components/StammbaumTree.svelte.test.ts
rename to frontend/src/lib/person/StammbaumTree.svelte.test.ts
diff --git a/frontend/src/lib/person-validation.test.ts b/frontend/src/lib/person/person-validation.test.ts
similarity index 100%
rename from frontend/src/lib/person-validation.test.ts
rename to frontend/src/lib/person/person-validation.test.ts
diff --git a/frontend/src/lib/person-validation.ts b/frontend/src/lib/person/person-validation.ts
similarity index 100%
rename from frontend/src/lib/person-validation.ts
rename to frontend/src/lib/person/person-validation.ts
diff --git a/frontend/src/lib/relationshipLabels.test.ts b/frontend/src/lib/person/relationshipLabels.test.ts
similarity index 100%
rename from frontend/src/lib/relationshipLabels.test.ts
rename to frontend/src/lib/person/relationshipLabels.test.ts
diff --git a/frontend/src/lib/relationshipLabels.ts b/frontend/src/lib/person/relationshipLabels.ts
similarity index 100%
rename from frontend/src/lib/relationshipLabels.ts
rename to frontend/src/lib/person/relationshipLabels.ts
diff --git a/frontend/src/routes/SearchFilterBar.svelte b/frontend/src/routes/SearchFilterBar.svelte
index eb4c6b8e..3a7c61db 100644
--- a/frontend/src/routes/SearchFilterBar.svelte
+++ b/frontend/src/routes/SearchFilterBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import TagInput from '$lib/components/TagInput.svelte';
 import DateInput from '$lib/components/DateInput.svelte';
 import SortDropdown from '$lib/components/SortDropdown.svelte';
diff --git a/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte b/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
index a14bca9b..1ac6d236 100644
--- a/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
+++ b/frontend/src/routes/briefwechsel/ConversationFilterBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
index e059370d..4543c02e 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { onMount, tick } from 'svelte';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 interface RecentPerson {
diff --git a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
index 62d67337..5dc6bc34 100644
--- a/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
+++ b/frontend/src/routes/briefwechsel/CorrespondenzPersonBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import CorrespondentSuggestionsDropdown from './CorrespondentSuggestionsDropdown.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/routes/documents/[id]/+page.server.ts b/frontend/src/routes/documents/[id]/+page.server.ts
index 6f3d297b..82e53574 100644
--- a/frontend/src/routes/documents/[id]/+page.server.ts
+++ b/frontend/src/routes/documents/[id]/+page.server.ts
@@ -1,7 +1,7 @@
 import { error, redirect } from '@sveltejs/kit';
 import { createApiClient } from '$lib/api.server';
 import { getErrorMessage } from '$lib/errors';
-import { inferredRelationshipLabel } from '$lib/relationshipLabels';
+import { inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 
 export async function load({ params, fetch }) {
 	const { id } = params;
diff --git a/frontend/src/routes/geschichten/+page.svelte b/frontend/src/routes/geschichten/+page.svelte
index da5a4334..a45958fa 100644
--- a/frontend/src/routes/geschichten/+page.svelte
+++ b/frontend/src/routes/geschichten/+page.svelte
@@ -3,7 +3,7 @@ import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import { plainExcerpt } from '$lib/utils/extractText';
 import { formatDate } from '$lib/utils/date';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import type { PageData } from './$types';
 
 let { data }: { data: PageData } = $props();
diff --git a/frontend/src/routes/persons/+page.svelte b/frontend/src/routes/persons/+page.svelte
index a9fc76a9..a824a84e 100644
--- a/frontend/src/routes/persons/+page.svelte
+++ b/frontend/src/routes/persons/+page.svelte
@@ -3,7 +3,7 @@ import { goto } from '$app/navigation';
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import PersonTypeBadge from '$lib/components/PersonTypeBadge.svelte';
+import 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 7d30ebb4..a277a360 100644
--- a/frontend/src/routes/persons/[id]/PersonCard.svelte
+++ b/frontend/src/routes/persons/[id]/PersonCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { formatLifeDateRange } from '$lib/utils/personLifeDates';
-import PersonTypeBadge from '$lib/components/PersonTypeBadge.svelte';
+import PersonTypeBadge from '$lib/person/PersonTypeBadge.svelte';
 
 let {
 	person,
diff --git a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
index b032a15d..fecb5f03 100644
--- a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
+++ b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
-import PersonTypeahead from '$lib/components/PersonTypeahead.svelte';
+import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
 let {
diff --git a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
index 4cfe9898..e080d0c9 100644
--- a/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
+++ b/frontend/src/routes/persons/[id]/PersonMergePanel.svelte.spec.ts
@@ -4,7 +4,7 @@ import { page } from 'vitest/browser';
 import PersonMergePanel from './PersonMergePanel.svelte';
 
 vi.mock('$app/forms', () => ({ enhance: () => () => {} }));
-vi.mock('$lib/components/PersonTypeahead.svelte', () => ({
+vi.mock('$lib/person/PersonTypeahead.svelte', () => ({
 	default: () => null
 }));
 
diff --git a/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte b/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
index 96ca77a1..389cd894 100644
--- a/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
+++ b/frontend/src/routes/persons/[id]/PersonRelationshipsCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
-import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/relationshipLabels';
+import { chipLabel, otherName, inferredRelationshipLabel } from '$lib/person/relationshipLabels';
 import type { components } from '$lib/generated/api';
 
 type RelationshipDTO = components['schemas']['RelationshipDTO'];
diff --git a/frontend/src/routes/persons/[id]/edit/+page.server.ts b/frontend/src/routes/persons/[id]/edit/+page.server.ts
index 9658e59f..2d94c619 100644
--- a/frontend/src/routes/persons/[id]/edit/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/edit/+page.server.ts
@@ -5,7 +5,7 @@ import {
 	normalizePersonType,
 	validatePersonFields,
 	resolveValidationMessage
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 export async function load({ params, fetch, locals }) {
 	const canWrite =
diff --git a/frontend/src/routes/persons/[id]/edit/+page.svelte b/frontend/src/routes/persons/[id]/edit/+page.svelte
index f7dd05ce..9e513958 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/components/StammbaumCard.svelte';
+import StammbaumCard from '$lib/person/StammbaumCard.svelte';
 
 let { data, form } = $props();
 const person = $derived(data.person);
diff --git a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
index b53599ea..45a30330 100644
--- a/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
+++ b/frontend/src/routes/persons/[id]/edit/PersonEditForm.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
+import PersonTypeSelector from '$lib/person/PersonTypeSelector.svelte';
 import {
 	PERSON_TYPES as TYPES,
 	type PersonType,
 	type PersonFormData
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 let { person }: { person: PersonFormData } = $props();
 
diff --git a/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts b/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
index f8f49194..8ab799c2 100644
--- a/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
+++ b/frontend/src/routes/persons/[id]/edit/normalizePersonType.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { normalizePersonType } from '$lib/person-validation';
+import { normalizePersonType } from '$lib/person/person-validation';
 
 describe('edit load — SKIP → UNKNOWN normalization', () => {
 	it('maps SKIP to UNKNOWN', () => {
diff --git a/frontend/src/routes/persons/new/+page.server.ts b/frontend/src/routes/persons/new/+page.server.ts
index 73d6cc8e..3ed6619a 100644
--- a/frontend/src/routes/persons/new/+page.server.ts
+++ b/frontend/src/routes/persons/new/+page.server.ts
@@ -5,7 +5,7 @@ import {
 	normalizePersonType,
 	validatePersonFields,
 	resolveValidationMessage
-} from '$lib/person-validation';
+} from '$lib/person/person-validation';
 
 export async function load({ locals }: { locals: App.Locals }) {
 	const canWrite =
diff --git a/frontend/src/routes/persons/new/+page.svelte b/frontend/src/routes/persons/new/+page.svelte
index 7f9ccc48..a5c894bd 100644
--- a/frontend/src/routes/persons/new/+page.svelte
+++ b/frontend/src/routes/persons/new/+page.svelte
@@ -2,8 +2,8 @@
 import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import BackButton from '$lib/components/BackButton.svelte';
-import PersonTypeSelector from '$lib/components/PersonTypeSelector.svelte';
-import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person-validation';
+import PersonTypeSelector from '$lib/person/PersonTypeSelector.svelte';
+import { PERSON_TYPES as TYPES, type PersonType } from '$lib/person/person-validation';
 
 let { form } = $props();
 
diff --git a/frontend/src/routes/stammbaum/+page.svelte b/frontend/src/routes/stammbaum/+page.svelte
index f2e4423b..1e6da74d 100644
--- a/frontend/src/routes/stammbaum/+page.svelte
+++ b/frontend/src/routes/stammbaum/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 import { m } from '$lib/paraglide/messages.js';
 import { page } from '$app/state';
-import StammbaumTree from '$lib/components/StammbaumTree.svelte';
-import StammbaumSidePanel from '$lib/components/StammbaumSidePanel.svelte';
+import StammbaumTree from '$lib/person/StammbaumTree.svelte';
+import StammbaumSidePanel from '$lib/person/StammbaumSidePanel.svelte';
 import type { components } from '$lib/generated/api';
 
 type PersonNodeDTO = components['schemas']['PersonNodeDTO'];