diff --git a/lib/src/controllers/base_controller.dart b/lib/src/controllers/browse/base_controller.dart
similarity index 100%
rename from lib/src/controllers/base_controller.dart
rename to lib/src/controllers/browse/base_controller.dart
diff --git a/lib/src/services/allergen_checker.dart b/lib/src/services/system/allergen_checker.dart
similarity index 100%
rename from lib/src/services/allergen_checker.dart
rename to lib/src/services/system/allergen_checker.dart
diff --git a/lib/src/services/connectivity_service.dart b/lib/src/services/system/connectivity_service.dart
similarity index 100%
rename from lib/src/services/connectivity_service.dart
rename to lib/src/services/system/connectivity_service.dart
diff --git a/lib/src/services/crash_guard_service.dart b/lib/src/services/system/crash_guard_service.dart
similarity index 100%
rename from lib/src/services/crash_guard_service.dart
rename to lib/src/services/system/crash_guard_service.dart
diff --git a/lib/src/services/orientation_service.dart b/lib/src/services/system/orientation_service.dart
similarity index 100%
rename from lib/src/services/orientation_service.dart
rename to lib/src/services/system/orientation_service.dart
diff --git a/lib/src/services/permission_service.dart b/lib/src/services/system/permission_service.dart
similarity index 100%
rename from lib/src/services/permission_service.dart
rename to lib/src/services/system/permission_service.dart
diff --git a/lib/src/services/recommendation_service.dart b/lib/src/services/system/recommendation_service.dart
similarity index 100%
rename from lib/src/services/recommendation_service.dart
rename to lib/src/services/system/recommendation_service.dart
diff --git a/lib/src/widgets/recipe_detail/recipe_skeleton_view.dart b/lib/src/widgets/recipe_detail/content/recipe_skeleton_view.dart
similarity index 100%
rename from lib/src/widgets/recipe_detail/recipe_skeleton_view.dart
rename to lib/src/widgets/recipe_detail/content/recipe_skeleton_view.dart