diff --git a/lib/storage/git_storage.dart b/lib/core/git_repo.dart
similarity index 100%
rename from lib/storage/git_storage.dart
rename to lib/core/git_repo.dart
diff --git a/lib/core/note.dart b/lib/core/note.dart
index 5904b72d..c0dea91a 100644
--- a/lib/core/note.dart
+++ b/lib/core/note.dart
@@ -3,11 +3,11 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as p;
 
-import 'package:gitjournal/storage/serializers.dart';
 import 'package:gitjournal/utils/datetime.dart';
 
 import 'note_fileName.dart';
 import 'notes_folder.dart';
+import 'serializers.dart';
 
 enum NoteLoadState {
   None,
diff --git a/lib/core/notes_folder.dart b/lib/core/notes_folder.dart
index a7349459..2872ca1d 100644
--- a/lib/core/notes_folder.dart
+++ b/lib/core/notes_folder.dart
@@ -72,6 +72,8 @@ class NotesFolder with ChangeNotifier {
       if (e.isFolder) {
         e.folder.loadRecursively();
       } else {
+        // FIXME: Collected all the Errors, and report them back, along with "WHY", and the contents of the Note
+        //        Each of these needs to be reported to crashlytics, as Note loading should never fail
         e.note.load();
       }
     });
diff --git a/lib/storage/serializers.dart b/lib/core/serializers.dart
similarity index 100%
rename from lib/storage/serializers.dart
rename to lib/core/serializers.dart
diff --git a/lib/screens/journal_editor.dart b/lib/screens/journal_editor.dart
index ea0dc787..6cf5ce75 100644
--- a/lib/screens/journal_editor.dart
+++ b/lib/screens/journal_editor.dart
@@ -4,7 +4,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/journal_editor_header.dart';
-import 'package:gitjournal/storage/serializers.dart';
+import 'package:gitjournal/core/serializers.dart';
 
 enum NoteEditorDropDownChoices { Discard, SwitchEditor }
 
diff --git a/lib/state_container.dart b/lib/state_container.dart
index e780ff68..0bea952f 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -8,7 +8,7 @@ import 'package:gitjournal/apis/git_migration.dart';
 import 'package:gitjournal/appstate.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_folder.dart';
-import 'package:gitjournal/storage/git_storage.dart';
+import 'package:gitjournal/core/git_repo.dart';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';