diff --git a/lib/app.dart b/lib/app.dart
index b4e40452..fef57c62 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -18,12 +18,12 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_router.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/themes.dart';
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/app_router.dart b/lib/app_router.dart
index 8bf68c75..dab90482 100644
--- a/lib/app_router.dart
+++ b/lib/app_router.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/iap/purchase_screen.dart';
 import 'package:gitjournal/iap/purchase_thankyou_screen.dart';
@@ -12,10 +11,11 @@ import 'package:gitjournal/screens/home_screen.dart';
 import 'package:gitjournal/screens/login_screen.dart';
 import 'package:gitjournal/screens/note_editor.dart';
 import 'package:gitjournal/screens/onboarding_screens.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
 import 'package:gitjournal/screens/signup_screen.dart';
 import 'package:gitjournal/screens/tag_listing.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/setup/screens.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
diff --git a/lib/core/git_repo.dart b/lib/core/git_repo.dart
index 5b81ba8c..2d426606 100644
--- a/lib/core/git_repo.dart
+++ b/lib/core/git_repo.dart
@@ -8,7 +8,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 bool useDartGit = false;
diff --git a/lib/core/note.dart b/lib/core/note.dart
index a91c71fd..d8ce16a3 100644
--- a/lib/core/note.dart
+++ b/lib/core/note.dart
@@ -26,7 +26,7 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/processors/image_extractor.dart';
 import 'package:gitjournal/core/processors/inline_tags.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/markdown.dart';
diff --git a/lib/core/note_serializer.dart b/lib/core/note_serializer.dart
index 1d10f852..8ad94c34 100644
--- a/lib/core/note_serializer.dart
+++ b/lib/core/note_serializer.dart
@@ -20,7 +20,7 @@ import 'package:flutter_emoji/flutter_emoji.dart';
 import 'package:yaml/yaml.dart';
 
 import 'package:gitjournal/core/notes_folder.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'md_yaml_doc.dart';
diff --git a/lib/core/notes_cache.dart b/lib/core/notes_cache.dart
index 0d40052e..eed097c3 100644
--- a/lib/core/notes_cache.dart
+++ b/lib/core/notes_cache.dart
@@ -10,7 +10,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class NotesCache {
diff --git a/lib/core/notes_folder_config.dart b/lib/core/notes_folder_config.dart
index 1da551ef..07fedd9f 100644
--- a/lib/core/notes_folder_config.dart
+++ b/lib/core/notes_folder_config.dart
@@ -11,7 +11,7 @@ import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 @immutable
diff --git a/lib/core/notes_folder_fs.dart b/lib/core/notes_folder_fs.dart
index 4a164b9a..42bdd771 100644
--- a/lib/core/notes_folder_fs.dart
+++ b/lib/core/notes_folder_fs.dart
@@ -6,7 +6,7 @@ import 'package:path/path.dart' as p;
 import 'package:path/path.dart';
 import 'package:synchronized/synchronized.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'note.dart';
 import 'notes_folder.dart';
diff --git a/lib/core/virtual_notes_folder.dart b/lib/core/virtual_notes_folder.dart
index cd73b7d0..337f9f7d 100644
--- a/lib/core/virtual_notes_folder.dart
+++ b/lib/core/virtual_notes_folder.dart
@@ -1,4 +1,4 @@
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'note.dart';
 import 'notes_folder.dart';
 import 'notes_folder_notifier.dart';
diff --git a/lib/editors/markdown_editor.dart b/lib/editors/markdown_editor.dart
index 3585fd67..ce458006 100644
--- a/lib/editors/markdown_editor.dart
+++ b/lib/editors/markdown_editor.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/editors/common.dart';
@@ -13,6 +12,7 @@ import 'package:gitjournal/editors/heuristics.dart';
 import 'package:gitjournal/editors/note_body_editor.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/markdown_toolbar.dart';
diff --git a/lib/editors/scaffold.dart b/lib/editors/scaffold.dart
index a35fd914..33cafb4d 100644
--- a/lib/editors/scaffold.dart
+++ b/lib/editors/scaffold.dart
@@ -13,7 +13,7 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/org_links_handler.dart';
 import 'package:gitjournal/editors/bottom_bar.dart';
 import 'package:gitjournal/editors/common.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/widgets/note_viewer.dart';
 
 class EditorScaffold extends StatefulWidget {
diff --git a/lib/error_reporting.dart b/lib/error_reporting.dart
index 1ecb151d..552cbb57 100644
--- a/lib/error_reporting.dart
+++ b/lib/error_reporting.dart
@@ -11,7 +11,7 @@ import 'package:stack_trace/stack_trace.dart';
 
 import 'package:gitjournal/.env.dart';
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Future<void> initSentry() async {
diff --git a/lib/experiments/main_dashbook.dart b/lib/experiments/main_dashbook.dart
index 561ff47c..7a180745 100644
--- a/lib/experiments/main_dashbook.dart
+++ b/lib/experiments/main_dashbook.dart
@@ -6,8 +6,8 @@ import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/app_router.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/repository_manager.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 void main() async {
diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart
index 448e4fad..c627aea1 100644
--- a/lib/folder_views/common.dart
+++ b/lib/folder_views/common.dart
@@ -11,7 +11,7 @@ import 'package:gitjournal/folder_views/grid_view.dart';
 import 'package:gitjournal/folder_views/journal_view.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/screens/note_editor.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'common_types.dart';
diff --git a/lib/folder_views/list_view.dart b/lib/folder_views/list_view.dart
index 44bec670..74271dcd 100644
--- a/lib/folder_views/list_view.dart
+++ b/lib/folder_views/list_view.dart
@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/icon_dismissable.dart';
 
diff --git a/lib/iap/iap.dart b/lib/iap/iap.dart
index 4dba238f..94cc7e83 100644
--- a/lib/iap/iap.dart
+++ b/lib/iap/iap.dart
@@ -6,9 +6,9 @@ import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:in_app_purchase/store_kit_wrappers.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class InAppPurchases {
diff --git a/lib/iap/purchase_manager.dart b/lib/iap/purchase_manager.dart
index 91763ce6..482b32ab 100644
--- a/lib/iap/purchase_manager.dart
+++ b/lib/iap/purchase_manager.dart
@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/iap/purchase_slider.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 // ignore_for_file: cancel_subscriptions
diff --git a/lib/iap/purchase_widget.dart b/lib/iap/purchase_widget.dart
index 7709c9d2..ca06d8ea 100644
--- a/lib/iap/purchase_widget.dart
+++ b/lib/iap/purchase_widget.dart
@@ -7,11 +7,11 @@ import 'package:function_types/function_types.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap/iap.dart';
 import 'package:gitjournal/iap/purchase_manager.dart';
 import 'package:gitjournal/iap/purchase_slider.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class PurchaseButton extends StatelessWidget {
diff --git a/lib/main.dart b/lib/main.dart
index 5378f38d..32908f65 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -10,8 +10,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:stack_trace/stack_trace.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/lib/repository.dart b/lib/repository.dart
index d1e9df40..9d3cd77e 100644
--- a/lib/repository.dart
+++ b/lib/repository.dart
@@ -21,8 +21,8 @@ import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/settings.dart';
-import 'package:gitjournal/settings_migrations.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_migrations.dart';
 import 'package:gitjournal/setup/clone.dart';
 import 'package:gitjournal/utils/logger.dart';
 
diff --git a/lib/repository_manager.dart b/lib/repository_manager.dart
index 08e1e1ea..2f7e3e86 100644
--- a/lib/repository_manager.dart
+++ b/lib/repository_manager.dart
@@ -6,7 +6,7 @@ import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class RepositoryManager with ChangeNotifier {
diff --git a/lib/screens/debug_screen.dart b/lib/screens/debug_screen.dart
index d071d2b4..8175524e 100644
--- a/lib/screens/debug_screen.dart
+++ b/lib/screens/debug_screen.dart
@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class DebugScreen extends StatefulWidget {
diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index deaef1cb..4a09eb3a 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -19,10 +19,10 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/repository.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/folder_tree_view.dart';
diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart
index 4ab21989..cc488972 100644
--- a/lib/screens/folder_view.dart
+++ b/lib/screens/folder_view.dart
@@ -16,8 +16,8 @@ import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/screens/note_editor.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index 7482a222..40d4a45a 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -35,7 +35,7 @@ import 'package:gitjournal/editors/org_editor.dart';
 import 'package:gitjournal/editors/raw_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
diff --git a/lib/screens/onboarding_screens.dart b/lib/screens/onboarding_screens.dart
index 2ed32452..378dbd50 100644
--- a/lib/screens/onboarding_screens.dart
+++ b/lib/screens/onboarding_screens.dart
@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class OnBoardingScreen extends StatefulWidget {
   OnBoardingScreen();
diff --git a/lib/app_settings.dart b/lib/settings/app_settings.dart
similarity index 100%
rename from lib/app_settings.dart
rename to lib/settings/app_settings.dart
diff --git a/lib/settings.dart b/lib/settings/settings.dart
similarity index 100%
rename from lib/settings.dart
rename to lib/settings/settings.dart
diff --git a/lib/screens/settings_bottom_menu_bar.dart b/lib/settings/settings_bottom_menu_bar.dart
similarity index 97%
rename from lib/screens/settings_bottom_menu_bar.dart
rename to lib/settings/settings_bottom_menu_bar.dart
index b1129689..b023f8fb 100644
--- a/lib/screens/settings_bottom_menu_bar.dart
+++ b/lib/settings/settings_bottom_menu_bar.dart
@@ -4,7 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/screens/home_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 class BottomMenuBarSettings extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_display_images.dart b/lib/settings/settings_display_images.dart
similarity index 94%
rename from lib/screens/settings_display_images.dart
rename to lib/settings/settings_display_images.dart
index 89e838fd..10aee513 100644
--- a/lib/screens/settings_display_images.dart
+++ b/lib/settings/settings_display_images.dart
@@ -21,10 +21,10 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_display_images_caption.dart';
-import 'package:gitjournal/screens/settings_display_images_theming.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_display_images_caption.dart';
+import 'package:gitjournal/settings/settings_display_images_theming.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsDisplayImagesScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_display_images_caption.dart b/lib/settings/settings_display_images_caption.dart
similarity index 97%
rename from lib/screens/settings_display_images_caption.dart
rename to lib/settings/settings_display_images_caption.dart
index c9b62c15..635a386c 100644
--- a/lib/screens/settings_display_images_caption.dart
+++ b/lib/settings/settings_display_images_caption.dart
@@ -19,9 +19,9 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 
 class SettingsDisplayImagesCaptionScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_display_images_theming.dart b/lib/settings/settings_display_images_theming.dart
similarity index 97%
rename from lib/screens/settings_display_images_theming.dart
rename to lib/settings/settings_display_images_theming.dart
index 3599a526..8b633d2a 100644
--- a/lib/screens/settings_display_images_theming.dart
+++ b/lib/settings/settings_display_images_theming.dart
@@ -1,5 +1,3 @@
-
-
 /*
 Copyright 2020-2021 Roland Fredenhagen <important@van-fredenhagen.de>
 
@@ -21,9 +19,9 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 
 class SettingsDisplayImagesThemingScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_drawer.dart b/lib/settings/settings_drawer.dart
similarity index 100%
rename from lib/screens/settings_drawer.dart
rename to lib/settings/settings_drawer.dart
diff --git a/lib/screens/settings_editors.dart b/lib/settings/settings_editors.dart
similarity index 96%
rename from lib/screens/settings_editors.dart
rename to lib/settings/settings_editors.dart
index 312b0b80..2b8ad005 100644
--- a/lib/screens/settings_editors.dart
+++ b/lib/settings/settings_editors.dart
@@ -5,9 +5,9 @@ import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
diff --git a/lib/screens/settings_experimental.dart b/lib/settings/settings_experimental.dart
similarity index 98%
rename from lib/screens/settings_experimental.dart
rename to lib/settings/settings_experimental.dart
index 3a95c2bb..9d89653c 100644
--- a/lib/screens/settings_experimental.dart
+++ b/lib/settings/settings_experimental.dart
@@ -22,7 +22,7 @@ import 'package:crypto/crypto.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class ExperimentalSettingsScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_git_remote.dart b/lib/settings/settings_git_remote.dart
similarity index 98%
rename from lib/screens/settings_git_remote.dart
rename to lib/settings/settings_git_remote.dart
index dabb0270..d8da364d 100644
--- a/lib/screens/settings_git_remote.dart
+++ b/lib/settings/settings_git_remote.dart
@@ -9,8 +9,8 @@ import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/setup/screens.dart';
 import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/ssh/keygen.dart';
diff --git a/lib/screens/settings_images.dart b/lib/settings/settings_images.dart
similarity index 95%
rename from lib/screens/settings_images.dart
rename to lib/settings/settings_images.dart
index 79112ab9..9ba94d23 100644
--- a/lib/screens/settings_images.dart
+++ b/lib/settings/settings_images.dart
@@ -4,8 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 
 class SettingsImagesScreen extends StatefulWidget {
diff --git a/lib/settings_migrations.dart b/lib/settings/settings_migrations.dart
similarity index 99%
rename from lib/settings_migrations.dart
rename to lib/settings/settings_migrations.dart
index 37690544..f44f1315 100644
--- a/lib/settings_migrations.dart
+++ b/lib/settings/settings_migrations.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 Future<void> migrateSettings(
diff --git a/lib/screens/settings_misc.dart b/lib/settings/settings_misc.dart
similarity index 92%
rename from lib/screens/settings_misc.dart
rename to lib/settings/settings_misc.dart
index 62954638..c63032ec 100644
--- a/lib/screens/settings_misc.dart
+++ b/lib/settings/settings_misc.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsMisc extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_note_metadata.dart b/lib/settings/settings_note_metadata.dart
similarity index 99%
rename from lib/screens/settings_note_metadata.dart
rename to lib/settings/settings_note_metadata.dart
index 222e1c51..3a3d1d71 100644
--- a/lib/screens/settings_note_metadata.dart
+++ b/lib/settings/settings_note_metadata.dart
@@ -30,8 +30,8 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/editors/note_body_editor.dart';
 import 'package:gitjournal/editors/note_title_editor.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
 class NoteMetadataSettingsScreen extends StatefulWidget {
diff --git a/lib/screens/settings_screen.dart b/lib/settings/settings_screen.dart
similarity index 96%
rename from lib/screens/settings_screen.dart
rename to lib/settings/settings_screen.dart
index 69f1247b..0dc42f9d 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/settings/settings_screen.dart
@@ -31,24 +31,24 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/features.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
 import 'package:gitjournal/screens/debug_screen.dart';
 import 'package:gitjournal/screens/feature_timeline_screen.dart';
-import 'package:gitjournal/screens/settings_bottom_menu_bar.dart';
-import 'package:gitjournal/screens/settings_display_images.dart';
-import 'package:gitjournal/screens/settings_editors.dart';
-import 'package:gitjournal/screens/settings_experimental.dart';
-import 'package:gitjournal/screens/settings_git_remote.dart';
-import 'package:gitjournal/screens/settings_images.dart';
-import 'package:gitjournal/screens/settings_misc.dart';
-import 'package:gitjournal/screens/settings_note_metadata.dart';
-import 'package:gitjournal/screens/settings_tags.dart';
-import 'package:gitjournal/screens/settings_widgets.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_bottom_menu_bar.dart';
+import 'package:gitjournal/settings/settings_display_images.dart';
+import 'package:gitjournal/settings/settings_editors.dart';
+import 'package:gitjournal/settings/settings_experimental.dart';
+import 'package:gitjournal/settings/settings_git_remote.dart';
+import 'package:gitjournal/settings/settings_images.dart';
+import 'package:gitjournal/settings/settings_misc.dart';
+import 'package:gitjournal/settings/settings_note_metadata.dart';
+import 'package:gitjournal/settings/settings_tags.dart';
+import 'package:gitjournal/settings/settings_widgets.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
diff --git a/lib/screens/settings_tags.dart b/lib/settings/settings_tags.dart
similarity index 94%
rename from lib/screens/settings_tags.dart
rename to lib/settings/settings_tags.dart
index f7e7e7b2..d47ed50d 100644
--- a/lib/screens/settings_tags.dart
+++ b/lib/settings/settings_tags.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/screens/settings_screen.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SettingsTagsScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/settings_widgets.dart b/lib/settings/settings_widgets.dart
similarity index 100%
rename from lib/screens/settings_widgets.dart
rename to lib/settings/settings_widgets.dart
diff --git a/lib/setup/autoconfigure.dart b/lib/setup/autoconfigure.dart
index c2e2c787..ad11fbbf 100644
--- a/lib/setup/autoconfigure.dart
+++ b/lib/setup/autoconfigure.dart
@@ -8,7 +8,7 @@ import 'package:provider/provider.dart';
 import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'button.dart';
 import 'error.dart';
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index a8421af7..f816929e 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -16,7 +16,7 @@ import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/setup/autoconfigure.dart';
 import 'package:gitjournal/setup/button.dart';
 import 'package:gitjournal/setup/clone.dart';
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 6730cdf4..2941307f 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -6,7 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:share/share.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import '../app.dart';
 import '../core/note.dart';
 import '../editors/common_types.dart';
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 89eebb84..742f5a55 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -12,10 +12,10 @@ import 'package:time/time.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/repository_manager.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/app_drawer_header.dart';
diff --git a/lib/widgets/app_drawer_header.dart b/lib/widgets/app_drawer_header.dart
index 129db717..0390dd07 100644
--- a/lib/widgets/app_drawer_header.dart
+++ b/lib/widgets/app_drawer_header.dart
@@ -7,9 +7,9 @@ import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/repository.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 class AppDrawerHeader extends StatelessWidget {
   final Func0<void> repoListToggled;
diff --git a/lib/widgets/images/image_caption.dart b/lib/widgets/images/image_caption.dart
index 9204e155..917acb28 100644
--- a/lib/widgets/images/image_caption.dart
+++ b/lib/widgets/images/image_caption.dart
@@ -21,7 +21,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/hero_dialog.dart';
 
 class ImageCaption extends StatelessWidget {
diff --git a/lib/widgets/images/image_details.dart b/lib/widgets/images/image_details.dart
index f4318b93..65af58ec 100644
--- a/lib/widgets/images/image_details.dart
+++ b/lib/widgets/images/image_details.dart
@@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/widgets/images/markdown_image.dart';
 import 'package:gitjournal/widgets/images/themable_image.dart';
 
diff --git a/lib/widgets/images/markdown_image.dart b/lib/widgets/images/markdown_image.dart
index 82c71ccc..7c42a437 100644
--- a/lib/widgets/images/markdown_image.dart
+++ b/lib/widgets/images/markdown_image.dart
@@ -26,7 +26,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/widgets/images/image_caption.dart';
 import 'package:gitjournal/widgets/images/image_details.dart';
diff --git a/lib/widgets/note_search_delegate.dart b/lib/widgets/note_search_delegate.dart
index fc7afc24..ec6cd3af 100644
--- a/lib/widgets/note_search_delegate.dart
+++ b/lib/widgets/note_search_delegate.dart
@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -9,7 +7,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/virtual_notes_folder.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/themes.dart';
 
 class NoteSearchDelegate extends SearchDelegate<Note?> {
diff --git a/lib/widgets/pro_overlay.dart b/lib/widgets/pro_overlay.dart
index 82d905f7..315700a0 100644
--- a/lib/widgets/pro_overlay.dart
+++ b/lib/widgets/pro_overlay.dart
@@ -4,8 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
 import 'package:gitjournal/analytics/analytics.dart';
-import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 
 class ProOverlay extends StatelessWidget {
   final Widget child;
diff --git a/lib/widgets/sorting_mode_selector.dart b/lib/widgets/sorting_mode_selector.dart
index 55d6237a..8ee7dc33 100644
--- a/lib/widgets/sorting_mode_selector.dart
+++ b/lib/widgets/sorting_mode_selector.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/screens/settings_screen.dart';
+import 'package:gitjournal/settings/settings_screen.dart';
 
 class SortingModeSelector extends StatefulWidget {
   final SortingMode selectedMode;
diff --git a/test/checklist_test.dart b/test/checklist_test.dart
index d951daca..1a04a4cb 100644
--- a/test/checklist_test.dart
+++ b/test/checklist_test.dart
@@ -6,7 +6,7 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/checklist.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note', () {
diff --git a/test/flattened_notes_folder_large_test.dart b/test/flattened_notes_folder_large_test.dart
index 3498db7b..3302372b 100644
--- a/test/flattened_notes_folder_large_test.dart
+++ b/test/flattened_notes_folder_large_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Flattened Notes Folder Large Test', () {
diff --git a/test/flattened_notes_folder_test.dart b/test/flattened_notes_folder_test.dart
index b14551da..f3f92cc5 100644
--- a/test/flattened_notes_folder_test.dart
+++ b/test/flattened_notes_folder_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   var random = Random(DateTime.now().millisecondsSinceEpoch);
diff --git a/test/link_resolver_test.dart b/test/link_resolver_test.dart
index ca00e300..d36defbb 100644
--- a/test/link_resolver_test.dart
+++ b/test/link_resolver_test.dart
@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/link.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/link_resolver.dart';
 
 void main() {
diff --git a/test/note_serializer_test.dart b/test/note_serializer_test.dart
index 7dd44d8e..6440e558 100644
--- a/test/note_serializer_test.dart
+++ b/test/note_serializer_test.dart
@@ -6,7 +6,7 @@ import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/note_serializer.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note Serializer Test', () {
diff --git a/test/note_storage_test.dart b/test/note_storage_test.dart
index 22038c3d..546db2f9 100644
--- a/test/note_storage_test.dart
+++ b/test/note_storage_test.dart
@@ -7,7 +7,7 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 
 void main() {
diff --git a/test/note_test.dart b/test/note_test.dart
index fdd1812d..f504de73 100644
--- a/test/note_test.dart
+++ b/test/note_test.dart
@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Note', () {
diff --git a/test/notes_cache_test.dart b/test/notes_cache_test.dart
index 4102104b..836e80c3 100644
--- a/test/notes_cache_test.dart
+++ b/test/notes_cache_test.dart
@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/notes_cache.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Notes Cache', () {
diff --git a/test/notes_folder_config_test.dart b/test/notes_folder_config_test.dart
index ddca4837..76926360 100644
--- a/test/notes_folder_config_test.dart
+++ b/test/notes_folder_config_test.dart
@@ -9,7 +9,7 @@ import 'package:gitjournal/core/sorting_mode.dart';
 import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/folder_views/common.dart';
 import 'package:gitjournal/folder_views/standard_view.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Notes Folder Config', () {
diff --git a/test/processors/wiki_links_auto_add_test.dart b/test/processors/wiki_links_auto_add_test.dart
index 8c988479..d4826716 100644
--- a/test/processors/wiki_links_auto_add_test.dart
+++ b/test/processors/wiki_links_auto_add_test.dart
@@ -2,7 +2,7 @@ import 'package:test/test.dart';
 
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/processors/wiki_links_auto_add.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   test('Should process body', () {
diff --git a/test/sorted_notes_folder_test.dart b/test/sorted_notes_folder_test.dart
index a8448631..1f0cc64b 100644
--- a/test/sorted_notes_folder_test.dart
+++ b/test/sorted_notes_folder_test.dart
@@ -8,7 +8,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorted_notes_folder.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Sorted Notes Folder Test', () {
diff --git a/test/sorting_mode_test.dart b/test/sorting_mode_test.dart
index e39b3c49..4555799a 100644
--- a/test/sorting_mode_test.dart
+++ b/test/sorting_mode_test.dart
@@ -3,7 +3,7 @@ import 'package:test/test.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/core/sorting_mode.dart';
-import 'package:gitjournal/settings.dart';
+import 'package:gitjournal/settings/settings.dart';
 
 void main() {
   group('Sorting Mode', () {
diff --git a/test_driver/main.dart b/test_driver/main.dart
index 8066112b..b3f76d70 100644
--- a/test_driver/main.dart
+++ b/test_driver/main.dart
@@ -7,7 +7,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:time/time.dart';
 
 import 'package:gitjournal/app.dart';
-import 'package:gitjournal/app_settings.dart';
+import 'package:gitjournal/settings/app_settings.dart';
 import 'package:gitjournal/utils/datetime.dart';
 
 void main() async {