diff --git a/lib/widgets/editor_scroll_view.dart b/lib/editors/editor_scroll_view.dart
similarity index 100%
rename from lib/widgets/editor_scroll_view.dart
rename to lib/editors/editor_scroll_view.dart
diff --git a/lib/editors/journal_editor.dart b/lib/editors/journal_editor.dart
index 2fe6b780..d67c6ca7 100644
--- a/lib/editors/journal_editor.dart
+++ b/lib/editors/journal_editor.dart
@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/disposable_change_notifier.dart';
+import 'package:gitjournal/editors/editor_scroll_view.dart';
 import 'package:gitjournal/editors/heuristics.dart';
 import 'package:gitjournal/editors/note_body_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/utils/logger.dart';
-import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/journal_editor_header.dart';
 
 class JournalEditor extends StatefulWidget implements Editor {
diff --git a/lib/editors/markdown_editor.dart b/lib/editors/markdown_editor.dart
index 1cfcca77..82369c00 100644
--- a/lib/editors/markdown_editor.dart
+++ b/lib/editors/markdown_editor.dart
@@ -6,14 +6,14 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/disposable_change_notifier.dart';
+import 'package:gitjournal/editors/editor_scroll_view.dart';
 import 'package:gitjournal/editors/heuristics.dart';
+import 'package:gitjournal/editors/markdown_toolbar.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';
 
 class MarkdownEditor extends StatefulWidget implements Editor {
   final Note note;
diff --git a/lib/widgets/markdown_toolbar.dart b/lib/editors/markdown_toolbar.dart
similarity index 100%
rename from lib/widgets/markdown_toolbar.dart
rename to lib/editors/markdown_toolbar.dart
diff --git a/lib/widgets/note_editor_selector.dart b/lib/editors/note_editor_selector.dart
similarity index 100%
rename from lib/widgets/note_editor_selector.dart
rename to lib/editors/note_editor_selector.dart
diff --git a/lib/editors/org_editor.dart b/lib/editors/org_editor.dart
index ff98933d..40960905 100644
--- a/lib/editors/org_editor.dart
+++ b/lib/editors/org_editor.dart
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -23,8 +22,8 @@ import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/disposable_change_notifier.dart';
+import 'package:gitjournal/editors/editor_scroll_view.dart';
 import 'package:gitjournal/editors/undo_redo.dart';
-import 'package:gitjournal/widgets/editor_scroll_view.dart';
 
 class OrgEditor extends StatefulWidget implements Editor {
   final Note note;
diff --git a/lib/editors/raw_editor.dart b/lib/editors/raw_editor.dart
index 08ab79b8..53ad51d7 100644
--- a/lib/editors/raw_editor.dart
+++ b/lib/editors/raw_editor.dart
@@ -6,8 +6,8 @@ import 'package:gitjournal/core/md_yaml_doc_codec.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/editors/common.dart';
 import 'package:gitjournal/editors/disposable_change_notifier.dart';
+import 'package:gitjournal/editors/editor_scroll_view.dart';
 import 'package:gitjournal/editors/undo_redo.dart';
-import 'package:gitjournal/widgets/editor_scroll_view.dart';
 
 class RawEditor extends StatefulWidget implements Editor {
   final Note note;
diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart
index f22203b1..c374a440 100644
--- a/lib/screens/note_editor.dart
+++ b/lib/screens/note_editor.dart
@@ -29,6 +29,7 @@ import 'package:gitjournal/editors/checklist_editor.dart';
 import 'package:gitjournal/editors/common_types.dart';
 import 'package:gitjournal/editors/journal_editor.dart';
 import 'package:gitjournal/editors/markdown_editor.dart';
+import 'package:gitjournal/editors/note_editor_selector.dart';
 import 'package:gitjournal/editors/org_editor.dart';
 import 'package:gitjournal/editors/raw_editor.dart';
 import 'package:gitjournal/error_reporting.dart';
@@ -38,7 +39,6 @@ import 'package:gitjournal/utils/logger.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/folder_selection_dialog.dart';
 import 'package:gitjournal/widgets/note_delete_dialog.dart';
-import 'package:gitjournal/widgets/note_editor_selector.dart';
 import 'package:gitjournal/widgets/note_tag_editor.dart';
 import 'package:gitjournal/widgets/rename_dialog.dart';
 
diff --git a/lib/settings/git_config.dart b/lib/settings/git_config.dart
index b51ab9f0..cc09b8cc 100644
--- a/lib/settings/git_config.dart
+++ b/lib/settings/git_config.dart
@@ -29,6 +29,9 @@ class GitConfig extends ChangeNotifier with SettingsSharedPref {
 
   Future<void> save() async {
     var def = GitConfig(id, pref);
+    // I could call _load and get all the values
+    // and then compare it.
+    // why am I doing this? - I'm not sure
 
     await setString("gitAuthor", gitAuthor, def.gitAuthor);
     await setString("gitAuthorEmail", gitAuthorEmail, def.gitAuthorEmail);
@@ -49,3 +52,8 @@ class GitConfig extends ChangeNotifier with SettingsSharedPref {
     };
   }
 }
+
+// 1. Make sure we don't need to set the value and call save
+// 2. Less calls to setString so this is much faster
+
+// Optimizing this doesn't matter
diff --git a/lib/widgets/note_viewer.dart b/lib/widgets/note_viewer.dart
index 577e33d8..b8dd71e8 100644
--- a/lib/widgets/note_viewer.dart
+++ b/lib/widgets/note_viewer.dart
@@ -6,8 +6,8 @@ import 'package:provider/provider.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/editors/editor_scroll_view.dart';
 import 'package:gitjournal/folder_views/common.dart';
-import 'package:gitjournal/widgets/editor_scroll_view.dart';
 import 'package:gitjournal/widgets/markdown_renderer.dart';
 import 'package:gitjournal/widgets/notes_backlinks.dart';
 
diff --git a/test/markdown_toolbar_test.dart b/test/markdown_toolbar_test.dart
index a0c880f5..daf9c23b 100644
--- a/test/markdown_toolbar_test.dart
+++ b/test/markdown_toolbar_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:test/test.dart';
 
-import 'package:gitjournal/widgets/markdown_toolbar.dart';
+import 'package:gitjournal/editors/markdown_toolbar.dart';
 
 void main() {
   void _testLine({