diff --git a/lib/globals.dart b/lib/globals.dart
index b1b9170..cc6ad1f 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -17,8 +17,8 @@ import 'auth.dart';
 import 'config/base.dart';
 import 'config/shared_preferences.dart';
 import 'config/windows.dart';
-import 'gallery.dart';
 import 'main.dart';
+import 'pages/gallery.dart';
 import 'platform/clipboard.dart';
 import 'platform/display.dart';
 import 'platform/get_jar.dart';
@@ -28,8 +28,8 @@ import 'platform/set_title.dart';
 import 'tags.dart';
 import 'task.dart';
 import 'utils.dart';
-export 'galleries.dart' show GalleriesPageExtra;
-export 'gallery.dart' show GalleryPageExtra;
+export 'pages/galleries.dart' show GalleriesPageExtra;
+export 'pages/gallery.dart' show GalleryPageExtra;
 
 final dio = Dio()
   ..options.validateStatus = (int? _) {
diff --git a/lib/main.dart b/lib/main.dart
index ee4e9b1..75545fc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,22 +7,22 @@ import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
 import 'package:window_manager/window_manager.dart';
 import 'api/client.dart';
-import 'create_root_user.dart';
 import 'dialog/dialog_page.dart';
 import 'dialog/download_zip_page.dart';
 import 'dialog/gallery_details_page.dart';
 import 'dialog/new_download_task_page.dart';
 import 'dialog/task_page.dart';
-import 'galleries.dart';
-import 'gallery.dart';
 import 'globals.dart';
-import 'home.dart';
-import 'login.dart';
 import 'logs/file.dart';
-import 'server_settings.dart';
-import 'set_server.dart';
-import 'settings.dart';
-import 'task_manager.dart';
+import 'pages/create_root_user.dart';
+import 'pages/galleries.dart';
+import 'pages/gallery.dart';
+import 'pages/home.dart';
+import 'pages/login.dart';
+import 'pages/server_settings.dart';
+import 'pages/set_server.dart';
+import 'pages/settings.dart';
+import 'pages/task_manager.dart';
 import 'utils.dart';
 import 'viewer/single.dart';
 
diff --git a/lib/create_root_user.dart b/lib/pages/create_root_user.dart
similarity index 99%
rename from lib/create_root_user.dart
rename to lib/pages/create_root_user.dart
index d5908be..45e72c8 100644
--- a/lib/create_root_user.dart
+++ b/lib/pages/create_root_user.dart
@@ -3,7 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
 
-import 'globals.dart';
+import '../globals.dart';
 import 'login.dart';
 
 final _log = Logger("CreateRootUserPage");
@@ -177,7 +177,7 @@ class _CreateRootUserPage extends State<CreateRootUserPage>
                         ElevatedButton(
                           onPressed: !_isCreated && _isValid
                               ? () {
-                            setState(() {
+                                  setState(() {
                                     _isCreated = true;
                                   });
                                   _createRootUser(_username, _password)
diff --git a/lib/galleries.dart b/lib/pages/galleries.dart
similarity index 98%
rename from lib/galleries.dart
rename to lib/pages/galleries.dart
index e3fc2ef..4638121 100644
--- a/lib/galleries.dart
+++ b/lib/pages/galleries.dart
@@ -3,10 +3,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:logging/logging.dart';
-import 'api/client.dart';
-import 'api/gallery.dart';
-import 'globals.dart';
-import 'main.dart';
+import '../api/client.dart';
+import '../api/gallery.dart';
+import '../globals.dart';
+import '../main.dart';
 
 final _log = Logger("GalleriesPage");
 
diff --git a/lib/gallery.dart b/lib/pages/gallery.dart
similarity index 95%
rename from lib/gallery.dart
rename to lib/pages/gallery.dart
index b77b13a..c57dedb 100644
--- a/lib/gallery.dart
+++ b/lib/pages/gallery.dart
@@ -4,10 +4,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'api/file.dart';
-import 'api/gallery.dart';
-import 'components/gallery_info.dart';
-import 'globals.dart';
+import '../api/file.dart';
+import '../api/gallery.dart';
+import '../components/gallery_info.dart';
+import '../globals.dart';
 
 final _log = Logger("GalleryPage");
 
@@ -17,8 +17,7 @@ class GalleryPageExtra {
 }
 
 class GalleryPage extends StatefulWidget {
-  const GalleryPage(int gid, {super.key, this.title})
-      : _gid = gid;
+  const GalleryPage(int gid, {super.key, this.title}) : _gid = gid;
 
   final int _gid;
   final String? title;
diff --git a/lib/home.dart b/lib/pages/home.dart
similarity index 98%
rename from lib/home.dart
rename to lib/pages/home.dart
index 8494e8a..3e2335e 100644
--- a/lib/home.dart
+++ b/lib/pages/home.dart
@@ -3,8 +3,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'globals.dart';
-import 'main.dart';
+import '../globals.dart';
+import '../main.dart';
 
 final _log = Logger("HomePage");
 
diff --git a/lib/login.dart b/lib/pages/login.dart
similarity index 99%
rename from lib/login.dart
rename to lib/pages/login.dart
index 4cc99e1..e210614 100644
--- a/lib/login.dart
+++ b/lib/pages/login.dart
@@ -3,8 +3,8 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'globals.dart';
-import 'platform/device.dart';
+import '../globals.dart';
+import '../platform/device.dart';
 
 final _log = Logger("LoginPage");
 
diff --git a/lib/server_settings.dart b/lib/pages/server_settings.dart
similarity index 98%
rename from lib/server_settings.dart
rename to lib/pages/server_settings.dart
index 96b2dda..d55a58b 100644
--- a/lib/server_settings.dart
+++ b/lib/pages/server_settings.dart
@@ -4,13 +4,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'api/config.dart';
-import 'components/labeled_checkbox.dart';
-import 'components/number_field.dart';
-import 'components/string_list_field.dart';
-import 'components//string_map_field.dart';
-import 'globals.dart';
-import 'platform/ua.dart';
+import '../api/config.dart';
+import '../components/labeled_checkbox.dart';
+import '../components/number_field.dart';
+import '../components/string_list_field.dart';
+import '../components/string_map_field.dart';
+import '../globals.dart';
+import '../platform/ua.dart';
 
 final _log = Logger("ServerSettingsPage");
 
diff --git a/lib/set_server.dart b/lib/pages/set_server.dart
similarity index 99%
rename from lib/set_server.dart
rename to lib/pages/set_server.dart
index bac1c1a..a8be6ae 100644
--- a/lib/set_server.dart
+++ b/lib/pages/set_server.dart
@@ -3,7 +3,7 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'globals.dart';
+import '../globals.dart';
 
 final _log = Logger("SetServerPage");
 
diff --git a/lib/settings.dart b/lib/pages/settings.dart
similarity index 99%
rename from lib/settings.dart
rename to lib/pages/settings.dart
index 22b3661..0660e66 100644
--- a/lib/settings.dart
+++ b/lib/pages/settings.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:logging/logging.dart';
-import 'globals.dart';
-import 'main.dart';
-import 'utils.dart';
-import 'utils/filesize.dart';
+import '../globals.dart';
+import '../main.dart';
+import '../utils.dart';
+import '../utils/filesize.dart';
 
 final _log = Logger("SettingsPage");
 
diff --git a/lib/task_manager.dart b/lib/pages/task_manager.dart
similarity index 97%
rename from lib/task_manager.dart
rename to lib/pages/task_manager.dart
index 429e018..b8bf51e 100644
--- a/lib/task_manager.dart
+++ b/lib/pages/task_manager.dart
@@ -1,16 +1,14 @@
 import 'dart:ui';
 import 'package:enum_flag/enum_flag.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
-import 'api/task.dart';
-import 'components/task.dart';
-import 'globals.dart';
-import 'platform/media_query.dart';
-import 'utils.dart';
+import '../api/task.dart';
+import '../components/task.dart';
+import '../globals.dart';
+import '../platform/media_query.dart';
+import '../utils.dart';
 
 enum TaskStatusFilterFlag with EnumFlag {
   wait,