diff --git a/frontend/src/lib/components/GeschichteEditor.svelte b/frontend/src/lib/geschichte/GeschichteEditor.svelte
similarity index 99%
rename from frontend/src/lib/components/GeschichteEditor.svelte
rename to frontend/src/lib/geschichte/GeschichteEditor.svelte
index 862332fc..27d3d5d1 100644
--- a/frontend/src/lib/components/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 './PersonMultiSelect.svelte';
+import PersonMultiSelect from '$lib/components/PersonMultiSelect.svelte';
 import DocumentMultiSelect from '$lib/document/DocumentMultiSelect.svelte';
 
 type Geschichte = components['schemas']['Geschichte'];
diff --git a/frontend/src/lib/components/GeschichteEditor.svelte.spec.ts b/frontend/src/lib/geschichte/GeschichteEditor.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/GeschichteEditor.svelte.spec.ts
rename to frontend/src/lib/geschichte/GeschichteEditor.svelte.spec.ts
diff --git a/frontend/src/lib/components/GeschichtenCard.svelte b/frontend/src/lib/geschichte/GeschichtenCard.svelte
similarity index 100%
rename from frontend/src/lib/components/GeschichtenCard.svelte
rename to frontend/src/lib/geschichte/GeschichtenCard.svelte
diff --git a/frontend/src/lib/components/GeschichtenCard.svelte.spec.ts b/frontend/src/lib/geschichte/GeschichtenCard.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/GeschichtenCard.svelte.spec.ts
rename to frontend/src/lib/geschichte/GeschichtenCard.svelte.spec.ts
diff --git a/frontend/src/routes/geschichten/[id]/edit/+page.svelte b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
index 80bf0bf7..48b47874 100644
--- a/frontend/src/routes/geschichten/[id]/edit/+page.svelte
+++ b/frontend/src/routes/geschichten/[id]/edit/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import GeschichteEditor from '$lib/components/GeschichteEditor.svelte';
+import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
 import BackButton from '$lib/components/BackButton.svelte';
 import { getErrorMessage } from '$lib/errors';
 import type { PageData } from './$types';
diff --git a/frontend/src/routes/geschichten/new/+page.svelte b/frontend/src/routes/geschichten/new/+page.svelte
index 57f9cf49..c578ac91 100644
--- a/frontend/src/routes/geschichten/new/+page.svelte
+++ b/frontend/src/routes/geschichten/new/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import GeschichteEditor from '$lib/components/GeschichteEditor.svelte';
+import GeschichteEditor from '$lib/geschichte/GeschichteEditor.svelte';
 import BackButton from '$lib/components/BackButton.svelte';
 import { getErrorMessage } from '$lib/errors';
 import type { PageData } from './$types';
diff --git a/frontend/src/routes/persons/[id]/+page.svelte b/frontend/src/routes/persons/[id]/+page.svelte
index 3a627892..40d168c9 100644
--- a/frontend/src/routes/persons/[id]/+page.svelte
+++ b/frontend/src/routes/persons/[id]/+page.svelte
@@ -7,7 +7,7 @@ import NameHistoryCard from './NameHistoryCard.svelte';
 import CoCorrespondentsList from './CoCorrespondentsList.svelte';
 import PersonDocumentList from './PersonDocumentList.svelte';
 import PersonRelationshipsCard from './PersonRelationshipsCard.svelte';
-import GeschichtenCard from '$lib/components/GeschichtenCard.svelte';
+import GeschichtenCard from '$lib/geschichte/GeschichtenCard.svelte';
 
 let { data } = $props();