diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart
index be7fd253..e0ead58f 100644
--- a/lib/ui/views/app_selector/app_selector_view.dart
+++ b/lib/ui/views/app_selector/app_selector_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/theme.dart';
-import 'package:revanced_manager/ui/widgets/installed_app_item.dart';
-import 'package:revanced_manager/ui/widgets/search_bar.dart';
+import 'package:revanced_manager/ui/widgets/appSelectorView/installed_app_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart';
 import 'package:revanced_manager/ui/views/app_selector/app_selector_viewmodel.dart';
 
diff --git a/lib/ui/views/contributors/contributors_view.dart b/lib/ui/views/contributors/contributors_view.dart
index 61ca8b36..2ca66fff 100644
--- a/lib/ui/views/contributors/contributors_view.dart
+++ b/lib/ui/views/contributors/contributors_view.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:revanced_manager/ui/views/contributors/contributors_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/contributors_card.dart';
+import 'package:revanced_manager/ui/widgets/contributorsView/contributors_card.dart';
 import 'package:stacked/stacked.dart';
 
 class ContributorsView extends StatelessWidget {
diff --git a/lib/ui/views/home/home_view.dart b/lib/ui/views/home/home_view.dart
index 5659d9ec..2d3317c6 100644
--- a/lib/ui/views/home/home_view.dart
+++ b/lib/ui/views/home/home_view.dart
@@ -4,10 +4,10 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/theme.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/available_updates_card.dart';
-import 'package:revanced_manager/ui/widgets/dashboard_raw_chip.dart';
-import 'package:revanced_manager/ui/widgets/installed_apps_card.dart';
-import 'package:revanced_manager/ui/widgets/latest_commit_card.dart';
+import 'package:revanced_manager/ui/widgets/homeView/available_updates_card.dart';
+import 'package:revanced_manager/ui/widgets/homeView/dashboard_raw_chip.dart';
+import 'package:revanced_manager/ui/widgets/homeView/installed_apps_card.dart';
+import 'package:revanced_manager/ui/widgets/homeView/latest_commit_card.dart';
 import 'package:stacked/stacked.dart';
 
 class HomeView extends StatelessWidget {
diff --git a/lib/ui/views/patcher/patcher_view.dart b/lib/ui/views/patcher/patcher_view.dart
index 6985c4c9..c2f9bfb6 100644
--- a/lib/ui/views/patcher/patcher_view.dart
+++ b/lib/ui/views/patcher/patcher_view.dart
@@ -4,8 +4,8 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/theme.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/app_selector_card.dart';
-import 'package:revanced_manager/ui/widgets/patch_selector_card.dart';
+import 'package:revanced_manager/ui/widgets/patcherView/app_selector_card.dart';
+import 'package:revanced_manager/ui/widgets/patcherView/patch_selector_card.dart';
 import 'package:stacked/stacked.dart';
 
 class PatcherView extends StatelessWidget {
diff --git a/lib/ui/views/patches_selector/patches_selector_view.dart b/lib/ui/views/patches_selector/patches_selector_view.dart
index 2a240585..12399ce2 100644
--- a/lib/ui/views/patches_selector/patches_selector_view.dart
+++ b/lib/ui/views/patches_selector/patches_selector_view.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/theme.dart';
 import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/patch_item.dart';
-import 'package:revanced_manager/ui/widgets/search_bar.dart';
+import 'package:revanced_manager/ui/widgets/patchesSelectorView/patch_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchesSelectorView extends StatefulWidget {
diff --git a/lib/ui/views/root_checker/root_checker_view.dart b/lib/ui/views/root_checker/root_checker_view.dart
index 034f353f..fd01aaba 100644
--- a/lib/ui/views/root_checker/root_checker_view.dart
+++ b/lib/ui/views/root_checker/root_checker_view.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/ui/views/root_checker/root_checker_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/magisk_button.dart';
+import 'package:revanced_manager/ui/widgets/rootCheckerView/magisk_button.dart';
 import 'package:stacked/stacked.dart';
 
 class RootCheckerView extends StatelessWidget {
diff --git a/lib/ui/views/settings/settings_view.dart b/lib/ui/views/settings/settings_view.dart
index e6e7d954..81ab1bca 100644
--- a/lib/ui/views/settings/settings_view.dart
+++ b/lib/ui/views/settings/settings_view.dart
@@ -4,7 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/constants.dart';
 import 'package:revanced_manager/theme.dart';
 import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/about_info_widget.dart';
+import 'package:revanced_manager/ui/widgets/settingsView/about_info_widget.dart';
 import 'package:stacked/stacked.dart';
 import 'package:stacked_themes/stacked_themes.dart';
 
diff --git a/lib/ui/widgets/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart
similarity index 100%
rename from lib/ui/widgets/installed_app_item.dart
rename to lib/ui/widgets/appSelectorView/installed_app_item.dart
diff --git a/lib/ui/widgets/contributors_card.dart b/lib/ui/widgets/contributorsView/contributors_card.dart
similarity index 100%
rename from lib/ui/widgets/contributors_card.dart
rename to lib/ui/widgets/contributorsView/contributors_card.dart
diff --git a/lib/ui/widgets/available_updates_card.dart b/lib/ui/widgets/homeView/available_updates_card.dart
similarity index 96%
rename from lib/ui/widgets/available_updates_card.dart
rename to lib/ui/widgets/homeView/available_updates_card.dart
index becf2682..5212f885 100644
--- a/lib/ui/widgets/available_updates_card.dart
+++ b/lib/ui/widgets/homeView/available_updates_card.dart
@@ -3,7 +3,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/application_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
 
 class AvailableUpdatesCard extends StatelessWidget {
   AvailableUpdatesCard({
diff --git a/lib/ui/widgets/dashboard_raw_chip.dart b/lib/ui/widgets/homeView/dashboard_raw_chip.dart
similarity index 100%
rename from lib/ui/widgets/dashboard_raw_chip.dart
rename to lib/ui/widgets/homeView/dashboard_raw_chip.dart
diff --git a/lib/ui/widgets/installed_apps_card.dart b/lib/ui/widgets/homeView/installed_apps_card.dart
similarity index 96%
rename from lib/ui/widgets/installed_apps_card.dart
rename to lib/ui/widgets/homeView/installed_apps_card.dart
index 407b4906..4a7b5fa7 100644
--- a/lib/ui/widgets/installed_apps_card.dart
+++ b/lib/ui/widgets/homeView/installed_apps_card.dart
@@ -3,7 +3,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/application_item.dart';
+import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
 
 class InstalledAppsCard extends StatelessWidget {
   InstalledAppsCard({
diff --git a/lib/ui/widgets/latest_commit_card.dart b/lib/ui/widgets/homeView/latest_commit_card.dart
similarity index 98%
rename from lib/ui/widgets/latest_commit_card.dart
rename to lib/ui/widgets/homeView/latest_commit_card.dart
index b5681b02..7729c639 100644
--- a/lib/ui/widgets/latest_commit_card.dart
+++ b/lib/ui/widgets/homeView/latest_commit_card.dart
@@ -5,7 +5,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/constants.dart';
 import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
-import 'package:revanced_manager/ui/widgets/patch_text_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/patch_text_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
   final Function() onPressed;
diff --git a/lib/ui/widgets/app_selector_card.dart b/lib/ui/widgets/patcherView/app_selector_card.dart
similarity index 100%
rename from lib/ui/widgets/app_selector_card.dart
rename to lib/ui/widgets/patcherView/app_selector_card.dart
diff --git a/lib/ui/widgets/patch_selector_card.dart b/lib/ui/widgets/patcherView/patch_selector_card.dart
similarity index 100%
rename from lib/ui/widgets/patch_selector_card.dart
rename to lib/ui/widgets/patcherView/patch_selector_card.dart
diff --git a/lib/ui/widgets/patch_item.dart b/lib/ui/widgets/patchesSelectorView/patch_item.dart
similarity index 100%
rename from lib/ui/widgets/patch_item.dart
rename to lib/ui/widgets/patchesSelectorView/patch_item.dart
diff --git a/lib/ui/widgets/magisk_button.dart b/lib/ui/widgets/rootCheckerView/magisk_button.dart
similarity index 100%
rename from lib/ui/widgets/magisk_button.dart
rename to lib/ui/widgets/rootCheckerView/magisk_button.dart
diff --git a/lib/ui/widgets/about_info_widget.dart b/lib/ui/widgets/settingsView/about_info_widget.dart
similarity index 100%
rename from lib/ui/widgets/about_info_widget.dart
rename to lib/ui/widgets/settingsView/about_info_widget.dart
diff --git a/lib/ui/widgets/application_item.dart b/lib/ui/widgets/shared/application_item.dart
similarity index 97%
rename from lib/ui/widgets/application_item.dart
rename to lib/ui/widgets/shared/application_item.dart
index d37c4d01..d170154a 100644
--- a/lib/ui/widgets/application_item.dart
+++ b/lib/ui/widgets/shared/application_item.dart
@@ -4,7 +4,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:revanced_manager/constants.dart';
 import 'package:revanced_manager/theme.dart';
-import 'package:revanced_manager/ui/widgets/patch_text_button.dart';
+import 'package:revanced_manager/ui/widgets/shared/patch_text_button.dart';
 import 'package:expandable/expandable.dart';
 import 'package:timeago/timeago.dart';
 
diff --git a/lib/ui/widgets/patch_text_button.dart b/lib/ui/widgets/shared/patch_text_button.dart
similarity index 100%
rename from lib/ui/widgets/patch_text_button.dart
rename to lib/ui/widgets/shared/patch_text_button.dart
diff --git a/lib/ui/widgets/search_bar.dart b/lib/ui/widgets/shared/search_bar.dart
similarity index 100%
rename from lib/ui/widgets/search_bar.dart
rename to lib/ui/widgets/shared/search_bar.dart