diff --git a/lib/utils/book/book_dao.dart b/lib/data/book/book_dao.dart
similarity index 100%
rename from lib/utils/book/book_dao.dart
rename to lib/data/book/book_dao.dart
diff --git a/lib/utils/book/book_excerpt_dao.dart b/lib/data/book/book_excerpt_dao.dart
similarity index 100%
rename from lib/utils/book/book_excerpt_dao.dart
rename to lib/data/book/book_excerpt_dao.dart
diff --git a/lib/utils/book/book_review_dao.dart b/lib/data/book/book_review_dao.dart
similarity index 100%
rename from lib/utils/book/book_review_dao.dart
rename to lib/data/book/book_review_dao.dart
diff --git a/lib/utils/database_helper.dart b/lib/data/database_helper.dart
similarity index 100%
rename from lib/utils/database_helper.dart
rename to lib/data/database_helper.dart
diff --git a/lib/utils/epub/reader_dao.dart b/lib/data/epub/reader_dao.dart
similarity index 100%
rename from lib/utils/epub/reader_dao.dart
rename to lib/data/epub/reader_dao.dart
diff --git a/lib/utils/epub/reader_models.dart b/lib/data/epub/reader_models.dart
similarity index 100%
rename from lib/utils/epub/reader_models.dart
rename to lib/data/epub/reader_models.dart
diff --git a/lib/utils/movie/movie_dao.dart b/lib/data/movie/movie_dao.dart
similarity index 100%
rename from lib/utils/movie/movie_dao.dart
rename to lib/data/movie/movie_dao.dart
diff --git a/lib/utils/movie/movie_poster_dao.dart b/lib/data/movie/movie_poster_dao.dart
similarity index 100%
rename from lib/utils/movie/movie_poster_dao.dart
rename to lib/data/movie/movie_poster_dao.dart
diff --git a/lib/utils/movie/movie_review_dao.dart b/lib/data/movie/movie_review_dao.dart
similarity index 100%
rename from lib/utils/movie/movie_review_dao.dart
rename to lib/data/movie/movie_review_dao.dart
diff --git a/lib/utils/note/note_dao.dart b/lib/data/note/note_dao.dart
similarity index 100%
rename from lib/utils/note/note_dao.dart
rename to lib/data/note/note_dao.dart
diff --git a/lib/utils/tag/tag_dao.dart b/lib/data/tag/tag_dao.dart
similarity index 100%
rename from lib/utils/tag/tag_dao.dart
rename to lib/data/tag/tag_dao.dart
diff --git a/lib/pages/encounter_page.dart b/lib/pages/explore/encounter_page.dart
similarity index 100%
rename from lib/pages/encounter_page.dart
rename to lib/pages/explore/encounter_page.dart
diff --git a/lib/pages/media_calendar_page.dart b/lib/pages/explore/media_calendar_page.dart
similarity index 100%
rename from lib/pages/media_calendar_page.dart
rename to lib/pages/explore/media_calendar_page.dart
diff --git a/lib/pages/person_list_page.dart b/lib/pages/explore/person_list_page.dart
similarity index 100%
rename from lib/pages/person_list_page.dart
rename to lib/pages/explore/person_list_page.dart
diff --git a/lib/pages/statistics_page.dart b/lib/pages/explore/statistics_page.dart
similarity index 100%
rename from lib/pages/statistics_page.dart
rename to lib/pages/explore/statistics_page.dart
diff --git a/lib/pages/stroll_page.dart b/lib/pages/explore/stroll_page.dart
similarity index 100%
rename from lib/pages/stroll_page.dart
rename to lib/pages/explore/stroll_page.dart
diff --git a/lib/pages/home_page.dart b/lib/pages/home/home_page.dart
similarity index 100%
rename from lib/pages/home_page.dart
rename to lib/pages/home/home_page.dart
diff --git a/lib/pages/main_content_page.dart b/lib/pages/home/main_content_page.dart
similarity index 100%
rename from lib/pages/main_content_page.dart
rename to lib/pages/home/main_content_page.dart
diff --git a/lib/pages/app_icon_picker_page.dart b/lib/pages/profile/app_icon_picker_page.dart
similarity index 100%
rename from lib/pages/app_icon_picker_page.dart
rename to lib/pages/profile/app_icon_picker_page.dart
diff --git a/lib/pages/changelog_page.dart b/lib/pages/profile/changelog_page.dart
similarity index 100%
rename from lib/pages/changelog_page.dart
rename to lib/pages/profile/changelog_page.dart
diff --git a/lib/pages/font_picker_page.dart b/lib/pages/profile/font_picker_page.dart
similarity index 100%
rename from lib/pages/font_picker_page.dart
rename to lib/pages/profile/font_picker_page.dart
diff --git a/lib/pages/profile_page.dart b/lib/pages/profile/profile_page.dart
similarity index 100%
rename from lib/pages/profile_page.dart
rename to lib/pages/profile/profile_page.dart
diff --git a/lib/pages/legal_page.dart b/lib/pages/settings/legal_page.dart
similarity index 100%
rename from lib/pages/legal_page.dart
rename to lib/pages/settings/legal_page.dart
diff --git a/lib/pages/recycle_bin_page.dart b/lib/pages/settings/recycle_bin_page.dart
similarity index 100%
rename from lib/pages/recycle_bin_page.dart
rename to lib/pages/settings/recycle_bin_page.dart
diff --git a/lib/pages/tag_management_page.dart b/lib/pages/settings/tag_management_page.dart
similarity index 100%
rename from lib/pages/tag_management_page.dart
rename to lib/pages/settings/tag_management_page.dart
diff --git a/lib/utils/app_icon_channel.dart b/lib/services/app_icon_channel.dart
similarity index 100%
rename from lib/utils/app_icon_channel.dart
rename to lib/services/app_icon_channel.dart
diff --git a/lib/utils/changelog_service.dart b/lib/services/changelog_service.dart
similarity index 100%
rename from lib/utils/changelog_service.dart
rename to lib/services/changelog_service.dart
diff --git a/lib/utils/epub/epub_parser.dart b/lib/services/epub/epub_parser.dart
similarity index 100%
rename from lib/utils/epub/epub_parser.dart
rename to lib/services/epub/epub_parser.dart
diff --git a/lib/utils/epub/epub_service.dart b/lib/services/epub/epub_service.dart
similarity index 100%
rename from lib/utils/epub/epub_service.dart
rename to lib/services/epub/epub_service.dart
diff --git a/lib/utils/epub/epub_stream_service.dart b/lib/services/epub/epub_stream_service.dart
similarity index 100%
rename from lib/utils/epub/epub_stream_service.dart
rename to lib/services/epub/epub_stream_service.dart
diff --git a/lib/utils/epub/epub_theme.dart b/lib/services/epub/epub_theme.dart
similarity index 100%
rename from lib/utils/epub/epub_theme.dart
rename to lib/services/epub/epub_theme.dart
diff --git a/lib/utils/epub/epub_webview_handler.dart b/lib/services/epub/epub_webview_handler.dart
similarity index 100%
rename from lib/utils/epub/epub_webview_handler.dart
rename to lib/services/epub/epub_webview_handler.dart
diff --git a/lib/utils/epub/reader_scripts.dart b/lib/services/epub/reader_scripts.dart
similarity index 100%
rename from lib/utils/epub/reader_scripts.dart
rename to lib/services/epub/reader_scripts.dart
diff --git a/lib/utils/epub/reader_settings.dart b/lib/services/epub/reader_settings.dart
similarity index 100%
rename from lib/utils/epub/reader_settings.dart
rename to lib/services/epub/reader_settings.dart
diff --git a/lib/utils/epub/web/reader_api.dart b/lib/services/epub/web/reader_api.dart
similarity index 100%
rename from lib/utils/epub/web/reader_api.dart
rename to lib/services/epub/web/reader_api.dart
diff --git a/lib/utils/epub/web/webview_bridge.dart b/lib/services/epub/web/webview_bridge.dart
similarity index 100%
rename from lib/utils/epub/web/webview_bridge.dart
rename to lib/services/epub/web/webview_bridge.dart
diff --git a/lib/utils/font_download_manager.dart b/lib/services/font_download_manager.dart
similarity index 100%
rename from lib/utils/font_download_manager.dart
rename to lib/services/font_download_manager.dart
diff --git a/lib/utils/sync/auto_backup_service.dart b/lib/services/sync/auto_backup_service.dart
similarity index 100%
rename from lib/utils/sync/auto_backup_service.dart
rename to lib/services/sync/auto_backup_service.dart
diff --git a/lib/utils/sync/backup_service.dart b/lib/services/sync/backup_service.dart
similarity index 100%
rename from lib/utils/sync/backup_service.dart
rename to lib/services/sync/backup_service.dart
diff --git a/lib/utils/sync/webdav_service.dart b/lib/services/sync/webdav_service.dart
similarity index 100%
rename from lib/utils/sync/webdav_service.dart
rename to lib/services/sync/webdav_service.dart
diff --git a/lib/utils/usage_stats_service.dart b/lib/services/usage_stats_service.dart
similarity index 100%
rename from lib/utils/usage_stats_service.dart
rename to lib/services/usage_stats_service.dart