diff --git a/lib/presentation/pages/order/order_page.dart b/lib/presentation/pages/order/order_list/order_page.dart
similarity index 96%
rename from lib/presentation/pages/order/order_page.dart
rename to lib/presentation/pages/order/order_list/order_page.dart
index 37bc786..7e22051 100644
--- a/lib/presentation/pages/order/order_page.dart
+++ b/lib/presentation/pages/order/order_list/order_page.dart
@@ -3,13 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:line_icons/line_icons.dart';
 
-import '../../../application/order/order_loader/order_loader_bloc.dart';
-import '../../../common/theme/theme.dart';
-import '../../../injection.dart';
-import '../../components/appbar/appbar.dart';
-import '../../components/button/button.dart';
-import '../../components/spacer/spacer.dart';
-import '../../components/widgets/empty_widget.dart';
+import '../../../../application/order/order_loader/order_loader_bloc.dart';
+import '../../../../common/theme/theme.dart';
+import '../../../../injection.dart';
+import '../../../components/appbar/appbar.dart';
+import '../../../components/button/button.dart';
+import '../../../components/spacer/spacer.dart';
+import '../../../components/widgets/empty_widget.dart';
 import 'widgets/status_tile.dart';
 import 'widgets/order_tile.dart';
 
diff --git a/lib/presentation/pages/order/widgets/order_tile.dart b/lib/presentation/pages/order/order_list/widgets/order_tile.dart
similarity index 99%
rename from lib/presentation/pages/order/widgets/order_tile.dart
rename to lib/presentation/pages/order/order_list/widgets/order_tile.dart
index f724262..77311a7 100644
--- a/lib/presentation/pages/order/widgets/order_tile.dart
+++ b/lib/presentation/pages/order/order_list/widgets/order_tile.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
-import '../../../../common/theme/theme.dart';
-import '../../../../domain/order/order.dart';
+import '../../../../../common/theme/theme.dart';
+import '../../../../../domain/order/order.dart';
 
 class OrderTile extends StatelessWidget {
   final Order order;
diff --git a/lib/presentation/pages/order/widgets/status_tile.dart b/lib/presentation/pages/order/order_list/widgets/status_tile.dart
similarity index 95%
rename from lib/presentation/pages/order/widgets/status_tile.dart
rename to lib/presentation/pages/order/order_list/widgets/status_tile.dart
index e373de7..10f627e 100644
--- a/lib/presentation/pages/order/widgets/status_tile.dart
+++ b/lib/presentation/pages/order/order_list/widgets/status_tile.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../../../common/theme/theme.dart';
+import '../../../../../common/theme/theme.dart';
 
 class OrderStatusTile extends StatelessWidget {
   final String label;
diff --git a/lib/presentation/router/app_router.gr.dart b/lib/presentation/router/app_router.gr.dart
index 8c9e144..2101015 100644
--- a/lib/presentation/router/app_router.gr.dart
+++ b/lib/presentation/router/app_router.gr.dart
@@ -27,7 +27,7 @@ import 'package:apskel_owner_flutter/presentation/pages/language/language_page.d
     as _i7;
 import 'package:apskel_owner_flutter/presentation/pages/main/main_page.dart'
     as _i9;
-import 'package:apskel_owner_flutter/presentation/pages/order/order_page.dart'
+import 'package:apskel_owner_flutter/presentation/pages/order/order_list/order_page.dart'
     as _i10;
 import 'package:apskel_owner_flutter/presentation/pages/product/product_list/product_page.dart'
     as _i11;
@@ -263,7 +263,7 @@ class OrderRoute extends _i18.PageRouteInfo<void> {
   static _i18.PageInfo page = _i18.PageInfo(
     name,
     builder: (data) {
-      return const _i10.OrderPage();
+      return _i18.WrappedRoute(child: const _i10.OrderPage());
     },
   );
 }