diff --git a/apps/web/components/orders/components/index.ts b/apps/web/components/orders/components/index.ts
deleted file mode 100644
index 6b7f476..0000000
--- a/apps/web/components/orders/components/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './back-button';
-export * from './contacts-grid';
-export * from './datetime-select';
-export * from './next-button';
-export * from './result';
-export * from './service-select';
-export * from './submit-button';
diff --git a/apps/web/components/orders/components/back-button.tsx b/apps/web/components/orders/order-form/back-button.tsx
similarity index 100%
rename from apps/web/components/orders/components/back-button.tsx
rename to apps/web/components/orders/order-form/back-button.tsx
diff --git a/apps/web/components/orders/components/contacts-grid.tsx b/apps/web/components/orders/order-form/contacts-grid.tsx
similarity index 100%
rename from apps/web/components/orders/components/contacts-grid.tsx
rename to apps/web/components/orders/order-form/contacts-grid.tsx
diff --git a/apps/web/components/orders/components/datetime-select.tsx b/apps/web/components/orders/order-form/datetime-select.tsx
similarity index 100%
rename from apps/web/components/orders/components/datetime-select.tsx
rename to apps/web/components/orders/order-form/datetime-select.tsx
diff --git a/apps/web/components/orders/order-form.tsx b/apps/web/components/orders/order-form/index.tsx
similarity index 73%
rename from apps/web/components/orders/order-form.tsx
rename to apps/web/components/orders/order-form/index.tsx
index 0a613bf..2d327eb 100644
--- a/apps/web/components/orders/order-form.tsx
+++ b/apps/web/components/orders/order-form/index.tsx
@@ -1,17 +1,13 @@
 'use client';
 
-import { LoadingSpinner } from '../common/spinner';
-import {
-  BackButton,
-  ClientsGrid,
-  DateTimeSelect,
-  ErrorPage,
-  MastersGrid,
-  NextButton,
-  ServiceSelect,
-  SuccessPage,
-} from './components';
-import { SubmitButton } from './components/submit-button';
+import { BackButton } from './back-button';
+import { ClientsGrid, MastersGrid } from './contacts-grid';
+import { DateTimeSelect } from './datetime-select';
+import { NextButton } from './next-button';
+import { ErrorPage, SuccessPage } from './result';
+import { ServiceSelect } from './service-select';
+import { SubmitButton } from './submit-button';
+import { LoadingSpinner } from '@/components/common/spinner';
 import { OrderStoreProvider, useInitOrderStore, useOrderStore } from '@/stores/order';
 import { withContext } from '@/utils/context';
 import { type JSX } from 'react';
diff --git a/apps/web/components/orders/components/next-button.tsx b/apps/web/components/orders/order-form/next-button.tsx
similarity index 100%
rename from apps/web/components/orders/components/next-button.tsx
rename to apps/web/components/orders/order-form/next-button.tsx
diff --git a/apps/web/components/orders/components/result.tsx b/apps/web/components/orders/order-form/result.tsx
similarity index 100%
rename from apps/web/components/orders/components/result.tsx
rename to apps/web/components/orders/order-form/result.tsx
diff --git a/apps/web/components/orders/components/service-select.tsx b/apps/web/components/orders/order-form/service-select.tsx
similarity index 100%
rename from apps/web/components/orders/components/service-select.tsx
rename to apps/web/components/orders/order-form/service-select.tsx
diff --git a/apps/web/components/orders/components/submit-button.tsx b/apps/web/components/orders/order-form/submit-button.tsx
similarity index 100%
rename from apps/web/components/orders/components/submit-button.tsx
rename to apps/web/components/orders/order-form/submit-button.tsx