Repository: ubuntu/yaru.dart

Issue:
src becomes messy
The `/src` folder is becoming a bit messy with 37 class files.
I think it would be nice to organize all those into subfolder (layout, controls, dialog, ...).

I don't think it would break something in apps, as we rely on a root `yaru_widgets.dart` index file which export all files, but maybe I'm wrong.

Wdyt @Feichtmeier ?


Discussion: nice idea - if this does not clash with some "common dart style" stuff? go for it
Well, I already saw many widget libraries which was sort their files into subfolder :)
Here is a proposal new organization of widgets files:

*/dialogs*

- `yaru_alert_dialog.dart`
- `yaru_dialog_title.dart`
- `yaru_simple_dialog.dart`

*/utilities*

- `yaru_banner.dart`
- `yaru_carousel.dart`
- `yaru_draggable.dart`
- `yaru_expandable.dart`
- `yaru_expansion_panel_list.dart`
- `yaru_safe_image.dart`
- `yaru_selectable_container.dart`
- `yaru_search_app_bar.dart`
- `ubuntu_logo.dart`

*/controls*

- `yaru_color_disk.dart`
- `yaru_color_picker_button.dart`
- `yaru_option_button.dart`
- `yaru_round_icon_button.dart`
- `yaru_round_toggle_button.dart`
- `yaru_progress_indicator.dart`

*/pages*

- `yaru_page.dart`
- `yaru_section.dart`
- `yaru_tabbed_page.dart`

*/pages/layouts*

- `yaru_compact_layout.dart`
- `yaru_landscape_layout.dart`
- `yaru_master_detail_page.dart`
- `yaru_narrow_layout.dart`
- `yaru_wide_layout.dart`
- `yaru_portrait_layout.dart`
- `yaru_page_item_list_view.dart`
- `yaru_page_item.dart`
- `yaru_page_item_title.dart`

*/pages/rows*

- `yaru_row.dart`
- `yaru_single_info_row.dart`
- `yaru_slider_row.dart`
- `yaru_switch_row.dart`
- `yaru_toggle_buttons_row.dart`
- `yaru_extra_option_row.dart`
- `yaru_checkbox_row.dart`

**note:** I don't know if I should put folder names in plural.
**note 2:** I saw flame is using plural names, IMO it is more logical to use plural for folders.

Wdyt @Feichtmeier ?
Sounds good

Fix patch:
diff --git a/lib/src/yaru_color_disk.dart b/lib/src/controls/yaru_color_disk.dart
similarity index 100%
rename from lib/src/yaru_color_disk.dart
rename to lib/src/controls/yaru_color_disk.dart
diff --git a/lib/src/yaru_color_picker_button.dart b/lib/src/controls/yaru_color_picker_button.dart
similarity index 100%
rename from lib/src/yaru_color_picker_button.dart
rename to lib/src/controls/yaru_color_picker_button.dart
diff --git a/lib/src/yaru_option_button.dart b/lib/src/controls/yaru_option_button.dart
similarity index 100%
rename from lib/src/yaru_option_button.dart
rename to lib/src/controls/yaru_option_button.dart
diff --git a/lib/src/yaru_progress_indicator.dart b/lib/src/controls/yaru_progress_indicator.dart
similarity index 100%
rename from lib/src/yaru_progress_indicator.dart
rename to lib/src/controls/yaru_progress_indicator.dart
diff --git a/lib/src/yaru_round_icon_button.dart b/lib/src/controls/yaru_round_icon_button.dart
similarity index 100%
rename from lib/src/yaru_round_icon_button.dart
rename to lib/src/controls/yaru_round_icon_button.dart
diff --git a/lib/src/yaru_round_toggle_button.dart b/lib/src/controls/yaru_round_toggle_button.dart
similarity index 93%
rename from lib/src/yaru_round_toggle_button.dart
rename to lib/src/controls/yaru_round_toggle_button.dart
index 38e56fe82..4f9243f2d 100644
--- a/lib/src/yaru_round_toggle_button.dart
+++ b/lib/src/controls/yaru_round_toggle_button.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_round_icon_button.dart';
+import 'package:yaru_widgets/src/controls/yaru_round_icon_button.dart';
 
 /// A selectable [IconButton], wrapped in a [CircleAvatar]
 class YaruRoundToggleButton extends StatelessWidget {
diff --git a/lib/src/yaru_alert_dialog.dart b/lib/src/dialogs/yaru_alert_dialog.dart
similarity index 97%
rename from lib/src/yaru_alert_dialog.dart
rename to lib/src/dialogs/yaru_alert_dialog.dart
index bac79b96c..5e3131316 100644
--- a/lib/src/yaru_alert_dialog.dart
+++ b/lib/src/dialogs/yaru_alert_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:yaru_widgets/src/constants.dart';
-import 'package:yaru_widgets/src/yaru_dialog_title.dart';
+import 'package:yaru_widgets/src/dialogs/yaru_dialog_title.dart';
 
 class YaruAlertDialog extends StatelessWidget {
   const YaruAlertDialog({
diff --git a/lib/src/yaru_dialog_title.dart b/lib/src/dialogs/yaru_dialog_title.dart
similarity index 100%
rename from lib/src/yaru_dialog_title.dart
rename to lib/src/dialogs/yaru_dialog_title.dart
diff --git a/lib/src/yaru_simple_dialog.dart b/lib/src/dialogs/yaru_simple_dialog.dart
similarity index 97%
rename from lib/src/yaru_simple_dialog.dart
rename to lib/src/dialogs/yaru_simple_dialog.dart
index 785110baa..262387d43 100644
--- a/lib/src/yaru_simple_dialog.dart
+++ b/lib/src/dialogs/yaru_simple_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:yaru_widgets/src/constants.dart';
-import 'package:yaru_widgets/src/yaru_dialog_title.dart';
+import 'package:yaru_widgets/src/dialogs/yaru_dialog_title.dart';
 
 class YaruSimpleDialog extends StatelessWidget {
   /// Create a [SimpleDialog] with a close button
diff --git a/lib/src/yaru_compact_layout.dart b/lib/src/pages/layouts/yaru_compact_layout.dart
similarity index 100%
rename from lib/src/yaru_compact_layout.dart
rename to lib/src/pages/layouts/yaru_compact_layout.dart
diff --git a/lib/src/yaru_landscape_layout.dart b/lib/src/pages/layouts/yaru_landscape_layout.dart
similarity index 97%
rename from lib/src/yaru_landscape_layout.dart
rename to lib/src/pages/layouts/yaru_landscape_layout.dart
index 488fa5951..3f705ee1f 100644
--- a/lib/src/yaru_landscape_layout.dart
+++ b/lib/src/pages/layouts/yaru_landscape_layout.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_page_item_list_view.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_page_item_list_view.dart';
 
 import 'yaru_page_item.dart';
 
diff --git a/lib/src/yaru_master_detail_page.dart b/lib/src/pages/layouts/yaru_master_detail_page.dart
similarity index 91%
rename from lib/src/yaru_master_detail_page.dart
rename to lib/src/pages/layouts/yaru_master_detail_page.dart
index d166ff8f5..61d924d6c 100644
--- a/lib/src/yaru_master_detail_page.dart
+++ b/lib/src/pages/layouts/yaru_master_detail_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_landscape_layout.dart';
-import 'package:yaru_widgets/src/yaru_page_item.dart';
-import 'package:yaru_widgets/src/yaru_portrait_layout.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_landscape_layout.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_page_item.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_portrait_layout.dart';
 
 class YaruMasterDetailPage extends StatefulWidget {
   /// Creates a basic responsive layout with yaru theme,
diff --git a/lib/src/yaru_narrow_layout.dart b/lib/src/pages/layouts/yaru_narrow_layout.dart
similarity index 100%
rename from lib/src/yaru_narrow_layout.dart
rename to lib/src/pages/layouts/yaru_narrow_layout.dart
diff --git a/lib/src/yaru_page_item.dart b/lib/src/pages/layouts/yaru_page_item.dart
similarity index 100%
rename from lib/src/yaru_page_item.dart
rename to lib/src/pages/layouts/yaru_page_item.dart
diff --git a/lib/src/yaru_page_item_list_view.dart b/lib/src/pages/layouts/yaru_page_item_list_view.dart
similarity index 98%
rename from lib/src/yaru_page_item_list_view.dart
rename to lib/src/pages/layouts/yaru_page_item_list_view.dart
index 2bd2045cb..3c338fc06 100644
--- a/lib/src/yaru_page_item_list_view.dart
+++ b/lib/src/pages/layouts/yaru_page_item_list_view.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:yaru_widgets/src/constants.dart';
-import 'package:yaru_widgets/src/yaru_page_item.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_page_item.dart';
 
 const double _kScrollbarThickness = 8.0;
 const double _kScrollbarMargin = 2.0;
diff --git a/lib/src/yaru_page_item_title.dart b/lib/src/pages/layouts/yaru_page_item_title.dart
similarity index 100%
rename from lib/src/yaru_page_item_title.dart
rename to lib/src/pages/layouts/yaru_page_item_title.dart
diff --git a/lib/src/yaru_portrait_layout.dart b/lib/src/pages/layouts/yaru_portrait_layout.dart
similarity index 97%
rename from lib/src/yaru_portrait_layout.dart
rename to lib/src/pages/layouts/yaru_portrait_layout.dart
index abe52a125..2728889eb 100644
--- a/lib/src/yaru_portrait_layout.dart
+++ b/lib/src/pages/layouts/yaru_portrait_layout.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_page_item_list_view.dart';
+import 'package:yaru_widgets/src/pages/layouts/yaru_page_item_list_view.dart';
 
 import 'yaru_page_item.dart';
 
diff --git a/lib/src/yaru_wide_layout.dart b/lib/src/pages/layouts/yaru_wide_layout.dart
similarity index 100%
rename from lib/src/yaru_wide_layout.dart
rename to lib/src/pages/layouts/yaru_wide_layout.dart
diff --git a/lib/src/yaru_checkbox_row.dart b/lib/src/pages/rows/yaru_checkbox_row.dart
similarity index 100%
rename from lib/src/yaru_checkbox_row.dart
rename to lib/src/pages/rows/yaru_checkbox_row.dart
diff --git a/lib/src/yaru_extra_option_row.dart b/lib/src/pages/rows/yaru_extra_option_row.dart
similarity index 96%
rename from lib/src/yaru_extra_option_row.dart
rename to lib/src/pages/rows/yaru_extra_option_row.dart
index 580988179..32092ce42 100644
--- a/lib/src/yaru_extra_option_row.dart
+++ b/lib/src/pages/rows/yaru_extra_option_row.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_option_button.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
+import 'package:yaru_widgets/src/controls/yaru_option_button.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
 
 class YaruExtraOptionRow extends StatelessWidget {
   /// Creates a row having switch, label, description and YaruOptionButton.
diff --git a/lib/src/yaru_row.dart b/lib/src/pages/rows/yaru_row.dart
similarity index 100%
rename from lib/src/yaru_row.dart
rename to lib/src/pages/rows/yaru_row.dart
diff --git a/lib/src/yaru_single_info_row.dart b/lib/src/pages/rows/yaru_single_info_row.dart
similarity index 100%
rename from lib/src/yaru_single_info_row.dart
rename to lib/src/pages/rows/yaru_single_info_row.dart
diff --git a/lib/src/yaru_slider_row.dart b/lib/src/pages/rows/yaru_slider_row.dart
similarity index 98%
rename from lib/src/yaru_slider_row.dart
rename to lib/src/pages/rows/yaru_slider_row.dart
index 2371d1a6d..f5e5f5696 100644
--- a/lib/src/yaru_slider_row.dart
+++ b/lib/src/pages/rows/yaru_slider_row.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
 
 class YaruSliderRow extends StatelessWidget {
   /// Creates a yaru style slider.
diff --git a/lib/src/yaru_switch_row.dart b/lib/src/pages/rows/yaru_switch_row.dart
similarity index 97%
rename from lib/src/yaru_switch_row.dart
rename to lib/src/pages/rows/yaru_switch_row.dart
index ab65ebdaf..e12d8f77e 100644
--- a/lib/src/yaru_switch_row.dart
+++ b/lib/src/pages/rows/yaru_switch_row.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
 
 class YaruSwitchRow extends StatelessWidget {
   /// Creates yaru style switch. The [Switch] will be aligned horizontally along with the  `trailingWidget`.
diff --git a/lib/src/yaru_toggle_buttons_row.dart b/lib/src/pages/rows/yaru_toggle_buttons_row.dart
similarity index 98%
rename from lib/src/yaru_toggle_buttons_row.dart
rename to lib/src/pages/rows/yaru_toggle_buttons_row.dart
index 790cd9714..88002157f 100644
--- a/lib/src/yaru_toggle_buttons_row.dart
+++ b/lib/src/pages/rows/yaru_toggle_buttons_row.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
 
 class YaruToggleButtonsRow extends StatelessWidget {
   /// Creates a set of Yaru style toggle buttons.
diff --git a/lib/src/yaru_page.dart b/lib/src/pages/yaru_page.dart
similarity index 100%
rename from lib/src/yaru_page.dart
rename to lib/src/pages/yaru_page.dart
diff --git a/lib/src/yaru_section.dart b/lib/src/pages/yaru_section.dart
similarity index 100%
rename from lib/src/yaru_section.dart
rename to lib/src/pages/yaru_section.dart
diff --git a/lib/src/yaru_tabbed_page.dart b/lib/src/pages/yaru_tabbed_page.dart
similarity index 100%
rename from lib/src/yaru_tabbed_page.dart
rename to lib/src/pages/yaru_tabbed_page.dart
diff --git a/lib/src/ubuntu_logo.dart b/lib/src/utilities/ubuntu_logo.dart
similarity index 100%
rename from lib/src/ubuntu_logo.dart
rename to lib/src/utilities/ubuntu_logo.dart
diff --git a/lib/src/yaru_banner.dart b/lib/src/utilities/yaru_banner.dart
similarity index 100%
rename from lib/src/yaru_banner.dart
rename to lib/src/utilities/yaru_banner.dart
diff --git a/lib/src/yaru_carousel.dart b/lib/src/utilities/yaru_carousel.dart
similarity index 100%
rename from lib/src/yaru_carousel.dart
rename to lib/src/utilities/yaru_carousel.dart
diff --git a/lib/src/yaru_draggable.dart b/lib/src/utilities/yaru_draggable.dart
similarity index 100%
rename from lib/src/yaru_draggable.dart
rename to lib/src/utilities/yaru_draggable.dart
diff --git a/lib/src/yaru_expandable.dart b/lib/src/utilities/yaru_expandable.dart
similarity index 100%
rename from lib/src/yaru_expandable.dart
rename to lib/src/utilities/yaru_expandable.dart
diff --git a/lib/src/yaru_expansion_panel_list.dart b/lib/src/utilities/yaru_expansion_panel_list.dart
similarity index 100%
rename from lib/src/yaru_expansion_panel_list.dart
rename to lib/src/utilities/yaru_expansion_panel_list.dart
diff --git a/lib/src/yaru_safe_image.dart b/lib/src/utilities/yaru_safe_image.dart
similarity index 100%
rename from lib/src/yaru_safe_image.dart
rename to lib/src/utilities/yaru_safe_image.dart
diff --git a/lib/src/yaru_search_app_bar.dart b/lib/src/utilities/yaru_search_app_bar.dart
similarity index 100%
rename from lib/src/yaru_search_app_bar.dart
rename to lib/src/utilities/yaru_search_app_bar.dart
diff --git a/lib/src/yaru_selectable_container.dart b/lib/src/utilities/yaru_selectable_container.dart
similarity index 100%
rename from lib/src/yaru_selectable_container.dart
rename to lib/src/utilities/yaru_selectable_container.dart
diff --git a/lib/yaru_widgets.dart b/lib/yaru_widgets.dart
index 7ef02eafa..ca3a1977e 100644
--- a/lib/yaru_widgets.dart
+++ b/lib/yaru_widgets.dart
@@ -1,36 +1,36 @@
 library yaru_widgets;
 
-export 'src/ubuntu_logo.dart';
-export 'src/yaru_alert_dialog.dart';
-export 'src/yaru_banner.dart';
-export 'src/yaru_carousel.dart';
-export 'src/yaru_checkbox_row.dart';
-export 'src/yaru_color_disk.dart';
-export 'src/yaru_color_picker_button.dart';
-export 'src/yaru_compact_layout.dart';
-export 'src/yaru_dialog_title.dart';
-export 'src/yaru_draggable.dart';
-export 'src/yaru_expandable.dart';
-export 'src/yaru_expansion_panel_list.dart';
-export 'src/yaru_extra_option_row.dart';
-export 'src/yaru_progress_indicator.dart';
-export 'src/yaru_master_detail_page.dart';
-export 'src/yaru_narrow_layout.dart';
-export 'src/yaru_option_button.dart';
-export 'src/yaru_page.dart';
-export 'src/yaru_page_item.dart';
-export 'src/yaru_page_item_title.dart';
-export 'src/yaru_round_icon_button.dart';
-export 'src/yaru_round_toggle_button.dart';
-export 'src/yaru_row.dart';
-export 'src/yaru_safe_image.dart';
-export 'src/yaru_search_app_bar.dart';
-export 'src/yaru_section.dart';
-export 'src/yaru_selectable_container.dart';
-export 'src/yaru_simple_dialog.dart';
-export 'src/yaru_single_info_row.dart';
-export 'src/yaru_slider_row.dart';
-export 'src/yaru_switch_row.dart';
-export 'src/yaru_tabbed_page.dart';
-export 'src/yaru_toggle_buttons_row.dart';
-export 'src/yaru_wide_layout.dart';
+export 'src/utilities/ubuntu_logo.dart';
+export 'src/dialogs/yaru_alert_dialog.dart';
+export 'src/utilities/yaru_banner.dart';
+export 'src/utilities/yaru_carousel.dart';
+export 'src/pages/rows/yaru_checkbox_row.dart';
+export 'src/controls/yaru_color_disk.dart';
+export 'src/controls/yaru_color_picker_button.dart';
+export 'src/pages/layouts/yaru_compact_layout.dart';
+export 'src/dialogs/yaru_dialog_title.dart';
+export 'src/utilities/yaru_draggable.dart';
+export 'src/utilities/yaru_expandable.dart';
+export 'src/utilities/yaru_expansion_panel_list.dart';
+export 'src/pages/rows/yaru_extra_option_row.dart';
+export 'src/controls/yaru_progress_indicator.dart';
+export 'src/pages/layouts/yaru_master_detail_page.dart';
+export 'src/pages/layouts/yaru_narrow_layout.dart';
+export 'src/controls/yaru_option_button.dart';
+export 'src/pages/yaru_page.dart';
+export 'src/pages/layouts/yaru_page_item.dart';
+export 'src/pages/layouts/yaru_page_item_title.dart';
+export 'src/controls/yaru_round_icon_button.dart';
+export 'src/controls/yaru_round_toggle_button.dart';
+export 'src/pages/rows/yaru_row.dart';
+export 'src/utilities/yaru_safe_image.dart';
+export 'src/utilities/yaru_search_app_bar.dart';
+export 'src/pages/yaru_section.dart';
+export 'src/utilities/yaru_selectable_container.dart';
+export 'src/dialogs/yaru_simple_dialog.dart';
+export 'src/pages/rows/yaru_single_info_row.dart';
+export 'src/pages/rows/yaru_slider_row.dart';
+export 'src/pages/rows/yaru_switch_row.dart';
+export 'src/pages/yaru_tabbed_page.dart';
+export 'src/pages/rows/yaru_toggle_buttons_row.dart';
+export 'src/pages/layouts/yaru_wide_layout.dart';


Test patch:
diff --git a/test/yaru_circular_progress_indicator_test.dart b/test/yaru_circular_progress_indicator_test.dart
index 5446d2333..a1e5c2058 100644
--- a/test/yaru_circular_progress_indicator_test.dart
+++ b/test/yaru_circular_progress_indicator_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_progress_indicator.dart';
+import 'package:yaru_widgets/src/controls/yaru_progress_indicator.dart';
 
 void main() {
   testWidgets('- YaruCircularProgressIndicator Test',
diff --git a/test/yaru_extra_options_row_test.dart b/test/yaru_extra_options_row_test.dart
index 30f1966a4..3a4491b5c 100644
--- a/test/yaru_extra_options_row_test.dart
+++ b/test/yaru_extra_options_row_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_extra_option_row.dart';
-import 'package:yaru_widgets/src/yaru_option_button.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_extra_option_row.dart';
+import 'package:yaru_widgets/src/controls/yaru_option_button.dart';
 
 void main() {
   testWidgets(
diff --git a/test/yaru_linear_progress_indicator_test.dart b/test/yaru_linear_progress_indicator_test.dart
index 9214b0bd1..fb965c9ad 100644
--- a/test/yaru_linear_progress_indicator_test.dart
+++ b/test/yaru_linear_progress_indicator_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_progress_indicator.dart';
+import 'package:yaru_widgets/src/controls/yaru_progress_indicator.dart';
 
 void main() {
   testWidgets('- YaruLinearProgressIndicator Test',
diff --git a/test/yaru_options_button_test.dart b/test/yaru_options_button_test.dart
index 1b4633b26..6e6c0faf4 100644
--- a/test/yaru_options_button_test.dart
+++ b/test/yaru_options_button_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_option_button.dart';
+import 'package:yaru_widgets/src/controls/yaru_option_button.dart';
 
 void main() {
   testWidgets('YaruOptionsButton Test', (WidgetTester tester) async {
diff --git a/test/yaru_row_test.dart b/test/yaru_row_test.dart
index c65067138..e8972708d 100644
--- a/test/yaru_row_test.dart
+++ b/test/yaru_row_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
 
 void main() {
   testWidgets(
diff --git a/test/yaru_selectable_container_test.dart b/test/yaru_selectable_container_test.dart
index cae5ea21c..577142916 100644
--- a/test/yaru_selectable_container_test.dart
+++ b/test/yaru_selectable_container_test.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_selectable_container.dart';
+import 'package:yaru_widgets/src/utilities/yaru_selectable_container.dart';
 
 void main() {
   testWidgets('- YaruImageTile Test', (WidgetTester tester) async {
diff --git a/test/yaru_single_info_row_test.dart b/test/yaru_single_info_row_test.dart
index ca2890ea6..4df52525e 100644
--- a/test/yaru_single_info_row_test.dart
+++ b/test/yaru_single_info_row_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_single_info_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_single_info_row.dart';
 
 void main() {
   testWidgets('- YaruSingleInfoRow Test', (WidgetTester tester) async {
diff --git a/test/yaru_switch_row_test.dart b/test/yaru_switch_row_test.dart
index 6981e6752..1b6d0685c 100644
--- a/test/yaru_switch_row_test.dart
+++ b/test/yaru_switch_row_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_row.dart';
-import 'package:yaru_widgets/src/yaru_switch_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_switch_row.dart';
 
 void main() {
   testWidgets('- YaruSwitchRow Test', (WidgetTester tester) async {
diff --git a/test/yaru_togggle_button_row_test.dart b/test/yaru_togggle_button_row_test.dart
index bde9f5665..0c0513163 100644
--- a/test/yaru_togggle_button_row_test.dart
+++ b/test/yaru_togggle_button_row_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:yaru_widgets/src/yaru_toggle_buttons_row.dart';
+import 'package:yaru_widgets/src/pages/rows/yaru_toggle_buttons_row.dart';
 
 void main() {
   testWidgets('- YaruToggleButtonsRow Test', (WidgetTester tester) async {