Move Note and NoteFolder class into a core folder

lib/appstate.dart

@@ -1,7 +1,7 @@
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:fimber/fimber.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 class AppState {
   //

lib/core/note.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:gitjournal/storage/serializers.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 
 enum NoteLoadState {
   None,

lib/core/note_fileName.dart

@@ -1,5 +1,5 @@
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:gitjournal/settings.dart';
 
 String getFileName(Note note) {

lib/core/note_folder.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:path/path.dart';
 
 // FIXME: Maybe the parent should be a part of the Note, and the NoteFolder

lib/screens/folder_listing.dart

@@ -4,7 +4,7 @@ import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/folder_tree_view.dart';
 import 'package:gitjournal/state_container.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 import 'journal_listing.dart';
 

lib/screens/journal_browsing.dart

@@ -2,7 +2,7 @@ import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/settings.dart';

lib/screens/journal_editor.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/widgets/journal_editor_header.dart';
 import 'package:gitjournal/storage/serializers.dart';

lib/screens/journal_listing.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/apis/git.dart';
 import 'package:gitjournal/screens/journal_editor.dart';

lib/state_container.dart

@@ -7,9 +7,9 @@ import 'package:flutter/material.dart';
 import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/apis/git_migration.dart';
 import 'package:gitjournal/appstate.dart';
-import 'package:gitjournal/note.dart';
-import 'package:gitjournal/note_folder.dart';
-import 'package:gitjournal/note_fileName.dart';
+import 'package:gitjournal/core/note.dart';
+import 'package:gitjournal/core/note_folder.dart';
+import 'package:gitjournal/core/note_fileName.dart';
 import 'package:gitjournal/storage/git_storage.dart';
 import 'package:path/path.dart' as p;
 import 'package:shared_preferences/shared_preferences.dart';

lib/storage/git_storage.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:fimber/fimber.dart';
 import 'package:flutter/foundation.dart';
 import 'package:gitjournal/apis/git.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:path/path.dart' as p;
 

lib/utils.dart

@@ -6,7 +6,7 @@ import 'package:package_info/package_info.dart';
 import 'package:flushbar/flushbar.dart';
 
 import 'app.dart';
-import 'note.dart';
+import 'core/note.dart';
 import 'state_container.dart';
 
 Future<String> getVersionString() async {

lib/widgets/folder_tree_view.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:gitjournal/note_folder.dart';
+import 'package:gitjournal/core/note_folder.dart';
 
 typedef void FolderSelectedCallback(NoteFolder folder);
 

lib/widgets/journal_editor_header.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 
 class JournalEditorHeader extends StatelessWidget {
   final Note note;

lib/widgets/journal_list.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/state_container.dart';
 import 'package:gitjournal/utils.dart';
 import 'package:gitjournal/utils/markdown.dart';

lib/widgets/notes_list.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/utils/markdown.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 

test/datetime_utils_test.dart

@@ -1,4 +1,4 @@
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
 void main() {

test/note_storage_test.dart

@@ -1,8 +1,8 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:gitjournal/datetime_utils.dart';
-import 'package:gitjournal/note.dart';
+import 'package:gitjournal/utils/datetime.dart';
+import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/storage/serializers.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';

test/serializers_test.dart

@@ -1,7 +1,7 @@
 import 'dart:collection';
 
 import 'package:gitjournal/storage/serializers.dart';
-import 'package:gitjournal/datetime_utils.dart';
+import 'package:gitjournal/utils/datetime.dart';
 import 'package:test/test.dart';
 
 DateTime nowWithoutMicro() {