diff --git a/apps/web/components/schedule/time-slots/components/add-slot-form.tsx b/apps/web/components/schedule/add-slot-form.tsx
similarity index 92%
rename from apps/web/components/schedule/time-slots/components/add-slot-form.tsx
rename to apps/web/components/schedule/add-slot-form.tsx
index cb6f127..580a7ba 100644
--- a/apps/web/components/schedule/time-slots/components/add-slot-form.tsx
+++ b/apps/web/components/schedule/add-slot-form.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable canonical/id-match */
 'use client';
-import { Context, ContextProvider } from '../context';
-import { AddTimePair } from './time-pair';
+import { AddTimePair } from './components/time-pair';
+import { Context, ContextProvider } from './context';
 import { ScheduleSlotsContext } from '@/context/schedule-slots';
 import { useSlotAdd } from '@/hooks/slots';
 import { withContext } from '@/utils/context';
diff --git a/apps/web/components/schedule/time-slots/components/slot-card.tsx b/apps/web/components/schedule/components/slot-card.tsx
similarity index 97%
rename from apps/web/components/schedule/time-slots/components/slot-card.tsx
rename to apps/web/components/schedule/components/slot-card.tsx
index e80cfe5..69afc9d 100644
--- a/apps/web/components/schedule/time-slots/components/slot-card.tsx
+++ b/apps/web/components/schedule/components/slot-card.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable canonical/id-match */
 'use client';
-import { type SlotProps } from '../../types';
 import { ContextProvider } from '../context';
+import { type SlotProps } from '../types';
 import { ReadonlyTimeRange } from './time-pair';
 import { useSlotQuery } from '@/hooks/slots';
 import { withContext } from '@/utils/context';
diff --git a/apps/web/components/schedule/time-slots/components/time-pair.tsx b/apps/web/components/schedule/components/time-pair.tsx
similarity index 97%
rename from apps/web/components/schedule/time-slots/components/time-pair.tsx
rename to apps/web/components/schedule/components/time-pair.tsx
index 8ebb8b6..954f6b1 100644
--- a/apps/web/components/schedule/time-slots/components/time-pair.tsx
+++ b/apps/web/components/schedule/components/time-pair.tsx
@@ -1,6 +1,6 @@
 'use client';
-import { type Slot } from '../../types';
 import { Context, type ContextType } from '../context';
+import { type Slot } from '../types';
 import { useSlotAdd } from '@/hooks/slots';
 import { formatTime } from '@/utils/date';
 import { Input } from '@repo/ui/components/ui/input';
diff --git a/apps/web/components/schedule/time-slots/context.tsx b/apps/web/components/schedule/context/index.tsx
similarity index 100%
rename from apps/web/components/schedule/time-slots/context.tsx
rename to apps/web/components/schedule/context/index.tsx
diff --git a/apps/web/components/schedule/index.ts b/apps/web/components/schedule/index.ts
index ad95298..54c5cbd 100644
--- a/apps/web/components/schedule/index.ts
+++ b/apps/web/components/schedule/index.ts
@@ -1,4 +1,5 @@
+export * from './add-slot-form';
 export * from './calendar';
 export * from './datetime-card';
 export * from './slot-buttons';
-export * from './time-slots';
+export * from './slots-list';
diff --git a/apps/web/components/schedule/time-slots/components/slots-list.tsx b/apps/web/components/schedule/slots-list.tsx
similarity index 90%
rename from apps/web/components/schedule/time-slots/components/slots-list.tsx
rename to apps/web/components/schedule/slots-list.tsx
index 7006bf4..e4259fa 100644
--- a/apps/web/components/schedule/time-slots/components/slots-list.tsx
+++ b/apps/web/components/schedule/slots-list.tsx
@@ -1,5 +1,5 @@
 'use client';
-import { SlotCard } from './slot-card';
+import { SlotCard } from './components/slot-card';
 import { LoadingSpinner } from '@/components/common/spinner';
 import { useSlots } from '@/hooks/slots';
 
diff --git a/apps/web/components/schedule/time-slots/index.ts b/apps/web/components/schedule/time-slots/index.ts
deleted file mode 100644
index 3ebfa3d..0000000
--- a/apps/web/components/schedule/time-slots/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components/add-slot-form';
-export * from './components/slots-list';
diff --git a/apps/web/components/schedule/types.tsx b/apps/web/components/schedule/types/index.tsx
similarity index 100%
rename from apps/web/components/schedule/types.tsx
rename to apps/web/components/schedule/types/index.tsx