diff --git a/src/features/calendar/AddEventForm.tsx b/src/features/calendar/AddEventForm.tsx
index ab1461a..f8adf9a 100644
--- a/src/features/calendar/AddEventForm.tsx
+++ b/src/features/calendar/AddEventForm.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useId, useRef, useState } from "react";
+import { TagPicker } from "../../shared/tags/TagPicker.js";
 import type { TagItem } from "../../shared/tags/types.js";
-import { TagPicker } from "../../shared/ui/tags/TagPicker.js";
 import { toYMDStr } from "./calEngine.js";
 import { DateRangePicker } from "./DateRangePicker.js";
 import { SingleDatePicker } from "./SingleDatePicker.js";
diff --git a/src/features/calendar/EventBar.tsx b/src/features/calendar/EventBar.tsx
index 2a8a0f7..02cf66d 100644
--- a/src/features/calendar/EventBar.tsx
+++ b/src/features/calendar/EventBar.tsx
@@ -1,4 +1,4 @@
-import { readableInk } from "../../shared/ui/Tag/Tag.js";
+import { readableInk } from "../../shared/tags/Tag.js";
 import type { BarSeg } from "./calEngine.js";
 
 type Props = {
diff --git a/src/features/calendar/EventChip.tsx b/src/features/calendar/EventChip.tsx
index b86ddc4..153162d 100644
--- a/src/features/calendar/EventChip.tsx
+++ b/src/features/calendar/EventChip.tsx
@@ -1,4 +1,4 @@
-import { readableInk } from "../../shared/ui/Tag/Tag.js";
+import { readableInk } from "../../shared/tags/Tag.js";
 import type { CalEvent } from "./calEngine.js";
 
 type Props = {
diff --git a/src/features/calendar/EventEditForm.tsx b/src/features/calendar/EventEditForm.tsx
index fbc803a..fa10c09 100644
--- a/src/features/calendar/EventEditForm.tsx
+++ b/src/features/calendar/EventEditForm.tsx
@@ -1,7 +1,7 @@
 import { motion } from "motion/react";
 import { useId, useState } from "react";
+import { TagPicker } from "../../shared/tags/TagPicker.js";
 import type { TagItem } from "../../shared/tags/types.js";
-import { TagPicker } from "../../shared/ui/tags/TagPicker.js";
 import type { CalEvent } from "./calEngine.js";
 import { serialToYMDStr } from "./calEngine.js";
 import { DateRangePicker } from "./DateRangePicker.js";
diff --git a/src/features/calendar/EventRow.tsx b/src/features/calendar/EventRow.tsx
index fa54bd3..80a76d9 100644
--- a/src/features/calendar/EventRow.tsx
+++ b/src/features/calendar/EventRow.tsx
@@ -1,7 +1,7 @@
 import { motion } from "motion/react";
 import { useState } from "react";
+import { Tag } from "../../shared/tags/Tag.js";
 import { DeleteConfirmDialog } from "../../shared/ui/DeleteConfirmDialog.js";
-import { Tag } from "../../shared/ui/Tag/Tag.js";
 import { Check } from "./CalendarCore.js";
 import type { CalEvent } from "./calEngine.js";
 import { canExtendTodo, serialToMD } from "./calEngine.js";
diff --git a/src/features/calendar/TodayCard.tsx b/src/features/calendar/TodayCard.tsx
index dcf33bc..4be2e64 100644
--- a/src/features/calendar/TodayCard.tsx
+++ b/src/features/calendar/TodayCard.tsx
@@ -1,7 +1,7 @@
 import { motion } from "motion/react";
 import type { ReactNode } from "react";
+import { Tag } from "../../shared/tags/Tag.js";
 import { DeleteConfirmDialog } from "../../shared/ui/DeleteConfirmDialog.js";
-import { Tag } from "../../shared/ui/Tag/Tag.js";
 import type { CalHook } from "./CalendarCore.js";
 import { Check } from "./CalendarCore.js";
 import { type CalEvent, serial, WD } from "./calEngine.js";
diff --git a/src/features/todo/todoCreation.tsx b/src/features/todo/todoCreation.tsx
index e0eb4d1..c276443 100644
--- a/src/features/todo/todoCreation.tsx
+++ b/src/features/todo/todoCreation.tsx
@@ -1,8 +1,8 @@
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { readableInk } from "../../shared/tags/Tag.js";
+import { TagPicker } from "../../shared/tags/TagPicker.js";
 import { useTags } from "../../shared/tags/useTags.js";
-import { readableInk } from "../../shared/ui/Tag/Tag.js";
-import { TagPicker } from "../../shared/ui/tags/TagPicker.js";
 import "./todoCreation.css";
 import { confirmTodos, createTodo, formatTodayIso, generateTodos } from "./todoApi.js";
 
diff --git a/src/shared/ui/Tag/Tag.test.ts b/src/shared/tags/Tag.test.ts
similarity index 100%
rename from src/shared/ui/Tag/Tag.test.ts
rename to src/shared/tags/Tag.test.ts
diff --git a/src/shared/ui/Tag/Tag.tsx b/src/shared/tags/Tag.tsx
similarity index 100%
rename from src/shared/ui/Tag/Tag.tsx
rename to src/shared/tags/Tag.tsx
diff --git a/src/shared/ui/tags/TagChip.css b/src/shared/tags/TagChip.css
similarity index 100%
rename from src/shared/ui/tags/TagChip.css
rename to src/shared/tags/TagChip.css
diff --git a/src/shared/ui/tags/TagChip.tsx b/src/shared/tags/TagChip.tsx
similarity index 95%
rename from src/shared/ui/tags/TagChip.tsx
rename to src/shared/tags/TagChip.tsx
index b64f5e2..7a356da 100644
--- a/src/shared/ui/tags/TagChip.tsx
+++ b/src/shared/tags/TagChip.tsx
@@ -1,5 +1,5 @@
-import type { TagItem } from "../../tags/types.js";
-import { DeleteConfirmDialog } from "../DeleteConfirmDialog.js";
+import { DeleteConfirmDialog } from "../ui/DeleteConfirmDialog.js";
+import type { TagItem } from "./types.js";
 import "./TagChip.css";
 
 type Props = {
diff --git a/src/shared/ui/tags/TagEditorForm.tsx b/src/shared/tags/TagEditorForm.tsx
similarity index 100%
rename from src/shared/ui/tags/TagEditorForm.tsx
rename to src/shared/tags/TagEditorForm.tsx
diff --git a/src/shared/ui/tags/TagPicker.css b/src/shared/tags/TagPicker.css
similarity index 100%
rename from src/shared/ui/tags/TagPicker.css
rename to src/shared/tags/TagPicker.css
diff --git a/src/shared/ui/tags/TagPicker.tsx b/src/shared/tags/TagPicker.tsx
similarity index 98%
rename from src/shared/ui/tags/TagPicker.tsx
rename to src/shared/tags/TagPicker.tsx
index c49fc83..af3406a 100644
--- a/src/shared/ui/tags/TagPicker.tsx
+++ b/src/shared/tags/TagPicker.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
-import type { TagItem } from "../../tags/types.js";
 import { TagChip } from "./TagChip.js";
 import { TagEditorForm } from "./TagEditorForm.js";
+import type { TagItem } from "./types.js";
 import "./TagPicker.css";
 
 const DEFAULT_COLOR = "#8478C0";