diff --git a/frontend/src/app/(dashboard)/staff/page.tsx b/frontend/src/app/(dashboard)/staff/page.tsx
index ea9e9e9..71adcf0 100644
--- a/frontend/src/app/(dashboard)/staff/page.tsx
+++ b/frontend/src/app/(dashboard)/staff/page.tsx
@@ -15,7 +15,7 @@ import {
   resolveStaffFeatureLabel,
   formatAccessSummary,
   type FeaturePermState,
-} from './staff-permission-form';
+} from '../../../components/staff/staff-permission-form';
 import { Pencil, Trash2, Copy, Check, X } from 'lucide-react';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { staffApi, type StaffMemberDto } from '@/lib/api/staff';
diff --git a/frontend/src/app/(dashboard)/treatment/page.tsx b/frontend/src/app/(dashboard)/treatment/page.tsx
index dbd764e..1014b41 100644
--- a/frontend/src/app/(dashboard)/treatment/page.tsx
+++ b/frontend/src/app/(dashboard)/treatment/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { TreatmentWorkspace } from '@/components/treatment/TreatmentWorkspace';
+import { TreatmentWorkspace } from '@/components/ui/treatment/TreatmentWorkspace';
 import { useAuth } from '@/lib/hooks/useAuth';
 
 export default function TreatmentPage() {
diff --git a/frontend/src/app/(dashboard)/staff/staff-permission-form.ts b/frontend/src/components/staff/staff-permission-form.ts
similarity index 100%
rename from frontend/src/app/(dashboard)/staff/staff-permission-form.ts
rename to frontend/src/components/staff/staff-permission-form.ts
diff --git a/frontend/src/app/(dashboard)/staff/components/staffPermissions.ts b/frontend/src/components/staff/staffPermissions.ts
similarity index 100%
rename from frontend/src/app/(dashboard)/staff/components/staffPermissions.ts
rename to frontend/src/components/staff/staffPermissions.ts
diff --git a/frontend/src/components/treatment/AppointmentsStrip.tsx b/frontend/src/components/ui/treatment/AppointmentsStrip.tsx
similarity index 100%
rename from frontend/src/components/treatment/AppointmentsStrip.tsx
rename to frontend/src/components/ui/treatment/AppointmentsStrip.tsx
diff --git a/frontend/src/components/treatment/FdiToothChart.tsx b/frontend/src/components/ui/treatment/FdiToothChart.tsx
similarity index 97%
rename from frontend/src/components/treatment/FdiToothChart.tsx
rename to frontend/src/components/ui/treatment/FdiToothChart.tsx
index 0b0cd24..c38fd1d 100644
--- a/frontend/src/components/treatment/FdiToothChart.tsx
+++ b/frontend/src/components/ui/treatment/FdiToothChart.tsx
@@ -2,7 +2,7 @@
 
 import { useId } from 'react';
 import { FDI_LOWER_LEFT_TO_RIGHT, FDI_UPPER_LEFT_TO_RIGHT, getToothShapeKind } from '@/components/treatment/fdiToothMeta';
-import { ToothGlyph } from '@/components/treatment/ToothGlyph';
+import { ToothGlyph } from '@/components/ui/treatment/ToothGlyph';
 import type { FdiToothId } from '@/types/treatment';
 
 function quadrantMirrored(fdi: FdiToothId): boolean {
diff --git a/frontend/src/components/treatment/PastTreatmentsPanel.tsx b/frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx
similarity index 100%
rename from frontend/src/components/treatment/PastTreatmentsPanel.tsx
rename to frontend/src/components/ui/treatment/PastTreatmentsPanel.tsx
diff --git a/frontend/src/components/treatment/ToothGlyph.tsx b/frontend/src/components/ui/treatment/ToothGlyph.tsx
similarity index 100%
rename from frontend/src/components/treatment/ToothGlyph.tsx
rename to frontend/src/components/ui/treatment/ToothGlyph.tsx
diff --git a/frontend/src/components/treatment/TreatmentWorkspace.tsx b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
similarity index 98%
rename from frontend/src/components/treatment/TreatmentWorkspace.tsx
rename to frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
index dbe1e3f..b248784 100644
--- a/frontend/src/components/treatment/TreatmentWorkspace.tsx
+++ b/frontend/src/components/ui/treatment/TreatmentWorkspace.tsx
@@ -1,9 +1,9 @@
 'use client';
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { AppointmentsStrip } from '@/components/treatment/AppointmentsStrip';
-import { FdiToothChart } from '@/components/treatment/FdiToothChart';
-import { PastTreatmentsPanel } from '@/components/treatment/PastTreatmentsPanel';
+import { AppointmentsStrip } from '@/components/ui/treatment/AppointmentsStrip';
+import { FdiToothChart } from '@/components/ui/treatment/FdiToothChart';
+import { PastTreatmentsPanel } from '@/components/ui/treatment/PastTreatmentsPanel';
 import { Checkbox } from '@/components/ui/common/Checkbox';
 import { Button } from '@/components/ui/common/Button';
 import { isSameLocalCalendarDay, startOfLocalDay } from '@/lib/appointmentTime';