diff --git a/frontend/src/lib/document/BulkDocumentEditLayout.svelte b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
index 700e1eeb..316e81a8 100644
--- a/frontend/src/lib/document/BulkDocumentEditLayout.svelte
+++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte
@@ -15,7 +15,7 @@ import WhoWhenSection from './WhoWhenSection.svelte';
 import DescriptionSection from './DescriptionSection.svelte';
 import PdfViewer from '$lib/document/viewer/PdfViewer.svelte';
 import { bulkTitleFromFilename } from '$lib/document/filename';
-import type { Tag } from '$lib/components/TagInput.svelte';
+import type { Tag } from '$lib/tag/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/document/DescriptionSection.svelte b/frontend/src/lib/document/DescriptionSection.svelte
index 5c8589e7..a39fc9bd 100644
--- a/frontend/src/lib/document/DescriptionSection.svelte
+++ b/frontend/src/lib/document/DescriptionSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { onMount } from 'svelte';
-import TagInput, { type Tag } from '$lib/components/TagInput.svelte';
+import TagInput, { type Tag } from '$lib/tag/TagInput.svelte';
 import FieldLabelBadge from './FieldLabelBadge.svelte';
 import { m } from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/lib/document/DocumentEditLayout.svelte b/frontend/src/lib/document/DocumentEditLayout.svelte
index b13754c4..3dba82b4 100644
--- a/frontend/src/lib/document/DocumentEditLayout.svelte
+++ b/frontend/src/lib/document/DocumentEditLayout.svelte
@@ -11,7 +11,7 @@ import DocumentViewer from '$lib/document/DocumentViewer.svelte';
 import UploadZone from '$lib/document/UploadZone.svelte';
 import WhoWhenSection from '$lib/document/WhoWhenSection.svelte';
 import DescriptionSection from '$lib/document/DescriptionSection.svelte';
-import type { Tag } from '$lib/components/TagInput.svelte';
+import type { Tag } from '$lib/tag/TagInput.svelte';
 import type { components } from '$lib/generated/api';
 
 type Person = components['schemas']['Person'];
diff --git a/frontend/src/lib/document/ThumbnailRow.svelte b/frontend/src/lib/document/ThumbnailRow.svelte
index e7b9fd1e..1a532e1e 100644
--- a/frontend/src/lib/document/ThumbnailRow.svelte
+++ b/frontend/src/lib/document/ThumbnailRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import ConversationThumbnail from '$lib/conversation/ConversationThumbnail.svelte';
-import TagChipList from '$lib/components/TagChipList.svelte';
+import TagChipList from '$lib/tag/TagChipList.svelte';
 import { formatDate } from '$lib/utils/date';
 import * as m from '$lib/paraglide/messages.js';
 
diff --git a/frontend/src/lib/components/TagChipList.svelte b/frontend/src/lib/tag/TagChipList.svelte
similarity index 100%
rename from frontend/src/lib/components/TagChipList.svelte
rename to frontend/src/lib/tag/TagChipList.svelte
diff --git a/frontend/src/lib/components/TagChipList.svelte.spec.ts b/frontend/src/lib/tag/TagChipList.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagChipList.svelte.spec.ts
rename to frontend/src/lib/tag/TagChipList.svelte.spec.ts
diff --git a/frontend/src/lib/components/TagInput.svelte b/frontend/src/lib/tag/TagInput.svelte
similarity index 100%
rename from frontend/src/lib/components/TagInput.svelte
rename to frontend/src/lib/tag/TagInput.svelte
diff --git a/frontend/src/lib/components/TagInput.svelte.spec.ts b/frontend/src/lib/tag/TagInput.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagInput.svelte.spec.ts
rename to frontend/src/lib/tag/TagInput.svelte.spec.ts
diff --git a/frontend/src/lib/components/TagParentPicker.svelte b/frontend/src/lib/tag/TagParentPicker.svelte
similarity index 100%
rename from frontend/src/lib/components/TagParentPicker.svelte
rename to frontend/src/lib/tag/TagParentPicker.svelte
diff --git a/frontend/src/lib/components/TagParentPicker.svelte.spec.ts b/frontend/src/lib/tag/TagParentPicker.svelte.spec.ts
similarity index 100%
rename from frontend/src/lib/components/TagParentPicker.svelte.spec.ts
rename to frontend/src/lib/tag/TagParentPicker.svelte.spec.ts
diff --git a/frontend/src/routes/SearchFilterBar.svelte b/frontend/src/routes/SearchFilterBar.svelte
index 3a7c61db..4568323b 100644
--- a/frontend/src/routes/SearchFilterBar.svelte
+++ b/frontend/src/routes/SearchFilterBar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import PersonTypeahead from '$lib/person/PersonTypeahead.svelte';
-import TagInput from '$lib/components/TagInput.svelte';
+import TagInput from '$lib/tag/TagInput.svelte';
 import DateInput from '$lib/components/DateInput.svelte';
 import SortDropdown from '$lib/components/SortDropdown.svelte';
 import { slide } from 'svelte/transition';
diff --git a/frontend/src/routes/admin/tags/[id]/+page.svelte b/frontend/src/routes/admin/tags/[id]/+page.svelte
index 2172ec25..b5da8219 100644
--- a/frontend/src/routes/admin/tags/[id]/+page.svelte
+++ b/frontend/src/routes/admin/tags/[id]/+page.svelte
@@ -5,7 +5,7 @@ import { page } from '$app/stores';
 import { m } from '$lib/paraglide/messages.js';
 import { createUnsavedWarning } from '$lib/hooks/useUnsavedWarning.svelte';
 import UnsavedWarningBanner from '$lib/components/UnsavedWarningBanner.svelte';
-import TagParentPicker from '$lib/components/TagParentPicker.svelte';
+import TagParentPicker from '$lib/tag/TagParentPicker.svelte';
 import TagAncestry from './TagAncestry.svelte';
 import TagChildrenPreview from './TagChildrenPreview.svelte';
 import TagMergeZone from './TagMergeZone.svelte';
diff --git a/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte b/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
index e4086286..9c77d5c0 100644
--- a/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
+++ b/frontend/src/routes/admin/tags/[id]/TagMergeZone.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
-import TagParentPicker from '$lib/components/TagParentPicker.svelte';
+import TagParentPicker from '$lib/tag/TagParentPicker.svelte';
 
 type FlatTag = {
 	id: string;