diff --git a/lib/hooks/use_paging_controller.dart b/lib/app/hooks/use_paging_controller.dart
similarity index 100%
rename from lib/hooks/use_paging_controller.dart
rename to lib/app/hooks/use_paging_controller.dart
diff --git a/lib/lists/albums_grid.dart b/lib/app/lists/albums_grid.dart
similarity index 100%
rename from lib/lists/albums_grid.dart
rename to lib/app/lists/albums_grid.dart
diff --git a/lib/lists/list_items.dart b/lib/app/lists/list_items.dart
similarity index 100%
rename from lib/lists/list_items.dart
rename to lib/app/lists/list_items.dart
diff --git a/lib/router.dart b/lib/app/router.dart
similarity index 100%
rename from lib/router.dart
rename to lib/app/router.dart
diff --git a/lib/screens/album_screen.dart b/lib/app/screens/album_screen.dart
similarity index 100%
rename from lib/screens/album_screen.dart
rename to lib/app/screens/album_screen.dart
diff --git a/lib/screens/artist_screen.dart b/lib/app/screens/artist_screen.dart
similarity index 100%
rename from lib/screens/artist_screen.dart
rename to lib/app/screens/artist_screen.dart
diff --git a/lib/screens/library_screen.dart b/lib/app/screens/library_screen.dart
similarity index 100%
rename from lib/screens/library_screen.dart
rename to lib/app/screens/library_screen.dart
diff --git a/lib/screens/now_playing_screen.dart b/lib/app/screens/now_playing_screen.dart
similarity index 100%
rename from lib/screens/now_playing_screen.dart
rename to lib/app/screens/now_playing_screen.dart
diff --git a/lib/screens/root_shell_screen.dart b/lib/app/screens/root_shell_screen.dart
similarity index 100%
rename from lib/screens/root_shell_screen.dart
rename to lib/app/screens/root_shell_screen.dart
diff --git a/lib/screens/settings_screen.dart b/lib/app/screens/settings_screen.dart
similarity index 100%
rename from lib/screens/settings_screen.dart
rename to lib/app/screens/settings_screen.dart
diff --git a/lib/util/clip.dart b/lib/app/util/clip.dart
similarity index 100%
rename from lib/util/clip.dart
rename to lib/app/util/clip.dart
diff --git a/lib/util/custom_scroll_fix.dart b/lib/app/util/custom_scroll_fix.dart
similarity index 100%
rename from lib/util/custom_scroll_fix.dart
rename to lib/app/util/custom_scroll_fix.dart
diff --git a/lib/main.dart b/lib/main.dart
index 0f00267..8795b72 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'router.dart';
+import 'app/router.dart';
 
 void main() {
   runApp(const MainApp());