diff --git a/lib/platform/url_strategy_web.dart b/lib/platform/url_strategy_web.dart
index 919bcee..36e00e4 100644
--- a/lib/platform/url_strategy_web.dart
+++ b/lib/platform/url_strategy_web.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+import 'package:flutter_web_plugins/flutter_web_plugins.dart' as flutter_web_plugins;
 
 /// Web implementation that sets the path URL strategy.
 void usePathUrlStrategy() {
diff --git a/lib/routes.dart b/lib/routes.dart
index 43dc6f8..5b13c8a 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -6,12 +6,12 @@ import 'package:qpay/screens/confirm/confirm_screen.dart';
 import 'package:qpay/screens/gateway/gateway_redirect.dart';
 import 'package:qpay/screens/gateway/gateway_screen.dart';
 import 'package:qpay/screens/gateway/gateway_web_screen.dart';
-import 'package:qpay/screens/groups/batch_create_screen.dart';
-import 'package:qpay/screens/groups/batch_detail_screen.dart';
-import 'package:qpay/screens/groups/batch_item_screen.dart';
-import 'package:qpay/screens/groups/group_create_screen.dart';
-import 'package:qpay/screens/groups/group_detail_screen.dart';
-import 'package:qpay/screens/groups/groups_screen.dart';
+import 'package:qpay/screens/groups/screens/batch_create_screen.dart';
+import 'package:qpay/screens/groups/screens/batch_detail_screen.dart';
+import 'package:qpay/screens/groups/screens/batch_item_screen.dart';
+import 'package:qpay/screens/groups/screens/group_create_screen.dart';
+import 'package:qpay/screens/groups/screens/group_detail_screen.dart';
+import 'package:qpay/screens/groups/screens/groups_screen.dart';
 import 'package:qpay/screens/groups/models/group_batch_model.dart';
 import 'package:qpay/screens/groups/models/recipient_group_model.dart';
 import 'package:qpay/screens/history/history_screen.dart';
diff --git a/lib/screens/groups/batch_create_screen.dart b/lib/screens/groups/screens/batch_create_screen.dart
similarity index 100%
rename from lib/screens/groups/batch_create_screen.dart
rename to lib/screens/groups/screens/batch_create_screen.dart
diff --git a/lib/screens/groups/batch_detail_screen.dart b/lib/screens/groups/screens/batch_detail_screen.dart
similarity index 100%
rename from lib/screens/groups/batch_detail_screen.dart
rename to lib/screens/groups/screens/batch_detail_screen.dart
diff --git a/lib/screens/groups/batch_item_screen.dart b/lib/screens/groups/screens/batch_item_screen.dart
similarity index 100%
rename from lib/screens/groups/batch_item_screen.dart
rename to lib/screens/groups/screens/batch_item_screen.dart
diff --git a/lib/screens/groups/group_create_screen.dart b/lib/screens/groups/screens/group_create_screen.dart
similarity index 99%
rename from lib/screens/groups/group_create_screen.dart
rename to lib/screens/groups/screens/group_create_screen.dart
index 04b2285..b9a43ff 100644
--- a/lib/screens/groups/group_create_screen.dart
+++ b/lib/screens/groups/screens/group_create_screen.dart
@@ -6,7 +6,7 @@ import 'package:qpay/screens/groups/controllers/group_controller.dart';
 import 'package:qpay/widgets/app_snack_bar.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import '../recipient/recipients_controller.dart';
+import '../../recipient/recipients_controller.dart';
 
 class GroupCreateScreen extends StatefulWidget {
   const GroupCreateScreen({super.key});
diff --git a/lib/screens/groups/group_detail_screen.dart b/lib/screens/groups/screens/group_detail_screen.dart
similarity index 100%
rename from lib/screens/groups/group_detail_screen.dart
rename to lib/screens/groups/screens/group_detail_screen.dart
diff --git a/lib/screens/groups/groups_screen.dart b/lib/screens/groups/screens/groups_screen.dart
similarity index 100%
rename from lib/screens/groups/groups_screen.dart
rename to lib/screens/groups/screens/groups_screen.dart
diff --git a/lib/screens/pay/pay_screen.dart b/lib/screens/pay/pay_screen.dart
index 7963d96..8704a6e 100644
--- a/lib/screens/pay/pay_screen.dart
+++ b/lib/screens/pay/pay_screen.dart
@@ -606,7 +606,8 @@ class _PayScreenState extends State<PayScreen> with TickerProviderStateMixin {
   }
 
   Widget _buildBillProductSelector(PayController controller) {
-    if (controller.model.products.isEmpty && !controller.model.isLoadingProducts) {
+    if (controller.model.products.isEmpty &&
+        !controller.model.isLoadingProducts) {
       return SizedBox.shrink();
     }