diff --git a/lib/components/drawer_component.dart b/lib/components/drawer_component.dart
index 31f4204..9c8fc5b 100644
--- a/lib/components/drawer_component.dart
+++ b/lib/components/drawer_component.dart
@@ -1,6 +1,6 @@
 import 'package:barcode_scanner/backend/schema/user/user_struct.dart';
-import 'package:barcode_scanner/pages/home_page/home_page_model.dart';
-import 'package:barcode_scanner/pages/login_page/login_page_model.dart';
+import 'package:barcode_scanner/pages/home/home_page_model.dart';
+import 'package:barcode_scanner/pages/login/login_page_model.dart';
 import 'package:barcode_scanner/router/go_router_builder.dart';
 import 'package:barcode_scanner/router/go_secure_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
diff --git a/lib/pages/home_page/home_page.dart b/lib/pages/home/home_page.dart
similarity index 98%
rename from lib/pages/home_page/home_page.dart
rename to lib/pages/home/home_page.dart
index 699c3d4..01ad330 100644
--- a/lib/pages/home_page/home_page.dart
+++ b/lib/pages/home/home_page.dart
@@ -1,5 +1,5 @@
 import 'package:barcode_scanner/components/components.dart';
-import 'package:barcode_scanner/pages/home_page/home_page_model.dart';
+import 'package:barcode_scanner/pages/home/home_page_model.dart';
 import 'package:barcode_scanner/router/go_secure_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pages/home_page/home_page_model.dart b/lib/pages/home/home_page_model.dart
similarity index 100%
rename from lib/pages/home_page/home_page_model.dart
rename to lib/pages/home/home_page_model.dart
diff --git a/lib/pages/home_page/home_page_model.freezed.dart b/lib/pages/home/home_page_model.freezed.dart
similarity index 100%
rename from lib/pages/home_page/home_page_model.freezed.dart
rename to lib/pages/home/home_page_model.freezed.dart
diff --git a/lib/pages/login_page/login_page.dart b/lib/pages/login/login_page.dart
similarity index 99%
rename from lib/pages/login_page/login_page.dart
rename to lib/pages/login/login_page.dart
index 7a94f03..6ce3c01 100644
--- a/lib/pages/login_page/login_page.dart
+++ b/lib/pages/login/login_page.dart
@@ -1,5 +1,5 @@
 import 'package:barcode_scanner/components/primary_button_component.dart';
-import 'package:barcode_scanner/pages/login_page/login_page_model.dart';
+import 'package:barcode_scanner/pages/login/login_page_model.dart';
 import 'package:barcode_scanner/router/go_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pages/login_page/login_page_model.dart b/lib/pages/login/login_page_model.dart
similarity index 100%
rename from lib/pages/login_page/login_page_model.dart
rename to lib/pages/login/login_page_model.dart
diff --git a/lib/pages/login_page/login_page_model.freezed.dart b/lib/pages/login/login_page_model.freezed.dart
similarity index 100%
rename from lib/pages/login_page/login_page_model.freezed.dart
rename to lib/pages/login/login_page_model.freezed.dart
diff --git a/lib/pages/pages.dart b/lib/pages/pages.dart
index fe21d21..8312fa8 100644
--- a/lib/pages/pages.dart
+++ b/lib/pages/pages.dart
@@ -1,7 +1,7 @@
-export 'home_page/home_page.dart';
-export 'login_page/login_page.dart';
-export 'product_form_page/product_form_page.dart';
-export 'scanner_page/scanner_page.dart';
-export 'splash_page/splash_page.dart';
-export 'product_list_page/product_list_page.dart';
+export 'home/home_page.dart';
+export 'login/login_page.dart';
+export 'product/product_form/product_form_page.dart';
+export 'scanner/scanner_page.dart';
+export 'splash/splash_page.dart';
+export 'product/product_list/product_list_page.dart';
 export 'profile/profile_page.dart';
diff --git a/lib/pages/product_form_page/product_form_page.dart b/lib/pages/product/product_form/product_form_page.dart
similarity index 98%
rename from lib/pages/product_form_page/product_form_page.dart
rename to lib/pages/product/product_form/product_form_page.dart
index 5c83072..5b0616f 100644
--- a/lib/pages/product_form_page/product_form_page.dart
+++ b/lib/pages/product/product_form/product_form_page.dart
@@ -1,7 +1,7 @@
 import 'package:barcode_scanner/components/loading_progress_component.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:barcode_scanner/components/primary_button_component.dart';
-import 'package:barcode_scanner/pages/product_form_page/product_form_page_model.dart';
+import 'package:barcode_scanner/pages/product/product_form/product_form_page_model.dart';
 import 'package:barcode_scanner/router/go_secure_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pages/product_form_page/product_form_page_model.dart b/lib/pages/product/product_form/product_form_page_model.dart
similarity index 100%
rename from lib/pages/product_form_page/product_form_page_model.dart
rename to lib/pages/product/product_form/product_form_page_model.dart
diff --git a/lib/pages/product_form_page/product_form_page_model.freezed.dart b/lib/pages/product/product_form/product_form_page_model.freezed.dart
similarity index 100%
rename from lib/pages/product_form_page/product_form_page_model.freezed.dart
rename to lib/pages/product/product_form/product_form_page_model.freezed.dart
diff --git a/lib/pages/product_list_page/product_list_page.dart b/lib/pages/product/product_list/product_list_page.dart
similarity index 97%
rename from lib/pages/product_list_page/product_list_page.dart
rename to lib/pages/product/product_list/product_list_page.dart
index 33a8214..1e70407 100644
--- a/lib/pages/product_list_page/product_list_page.dart
+++ b/lib/pages/product/product_list/product_list_page.dart
@@ -1,5 +1,5 @@
 import 'package:barcode_scanner/components/loading_progress_component.dart';
-import 'package:barcode_scanner/pages/product_list_page/product_list_page_model.dart';
+import 'package:barcode_scanner/pages/product/product_list/product_list_page_model.dart';
 import 'package:barcode_scanner/router/go_secure_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/pages/product_list_page/product_list_page_model.dart b/lib/pages/product/product_list/product_list_page_model.dart
similarity index 100%
rename from lib/pages/product_list_page/product_list_page_model.dart
rename to lib/pages/product/product_list/product_list_page_model.dart
diff --git a/lib/pages/product_list_page/product_list_page_model.freezed.dart b/lib/pages/product/product_list/product_list_page_model.freezed.dart
similarity index 100%
rename from lib/pages/product_list_page/product_list_page_model.freezed.dart
rename to lib/pages/product/product_list/product_list_page_model.freezed.dart
diff --git a/lib/pages/scanner_page/scanner_page.dart b/lib/pages/scanner/scanner_page.dart
similarity index 100%
rename from lib/pages/scanner_page/scanner_page.dart
rename to lib/pages/scanner/scanner_page.dart
diff --git a/lib/pages/splash_page/splash_page.dart b/lib/pages/splash/splash_page.dart
similarity index 93%
rename from lib/pages/splash_page/splash_page.dart
rename to lib/pages/splash/splash_page.dart
index 6ff6219..7394d14 100644
--- a/lib/pages/splash_page/splash_page.dart
+++ b/lib/pages/splash/splash_page.dart
@@ -1,5 +1,5 @@
 import 'package:barcode_scanner/components/loading_progress_component.dart';
-import 'package:barcode_scanner/pages/login_page/login_page_model.dart';
+import 'package:barcode_scanner/pages/login/login_page_model.dart';
 import 'package:barcode_scanner/router/go_router_builder.dart';
 import 'package:barcode_scanner/router/go_secure_router_builder.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';
diff --git a/lib/router/go_secure_router_builder.dart b/lib/router/go_secure_router_builder.dart
index 2580e9b..a8010ea 100644
--- a/lib/router/go_secure_router_builder.dart
+++ b/lib/router/go_secure_router_builder.dart
@@ -1,4 +1,4 @@
-import 'package:barcode_scanner/pages/login_page/login_page_model.dart';
+import 'package:barcode_scanner/pages/login/login_page_model.dart';
 import 'package:barcode_scanner/provider_container.dart';
 import 'package:barcode_scanner/router/go_router_builder.dart';
 import 'package:barcode_scanner/pages/pages.dart';
diff --git a/lib/services/service_initializer.dart b/lib/services/service_initializer.dart
index cce957c..70b3819 100644
--- a/lib/services/service_initializer.dart
+++ b/lib/services/service_initializer.dart
@@ -1,5 +1,5 @@
 import 'package:barcode_scanner/backend/objectbox/objectbox_manager.dart';
-import 'package:barcode_scanner/pages/login_page/login_page_model.dart';
+import 'package:barcode_scanner/pages/login/login_page_model.dart';
 import 'package:barcode_scanner/provider_container.dart';
 import 'package:barcode_scanner/themes/app_theme.dart';