diff --git a/lib/core/note_folder.dart b/lib/core/note_folder.dart
index 1f2d4860..4cc64ef0 100644
--- a/lib/core/note_folder.dart
+++ b/lib/core/note_folder.dart
@@ -1,27 +1,9 @@
 import 'dart:io';
 
-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
-//        or maybe also a part of the NoteFolder
-class NoteFSEntity {
-  NoteFolder parent;
-  NoteFolder folder;
-  Note note;
-
-  NoteFSEntity(this.parent, {this.folder, this.note}) {
-    assert(folder != null || note != null);
-  }
-
-  bool get isNote {
-    return note != null;
-  }
-
-  bool get isFolder {
-    return folder != null;
-  }
-}
+import 'note.dart';
+import 'note_fs_entity.dart';
 
 class NoteFolder {
   List<NoteFSEntity> entities = [];
diff --git a/lib/core/note_fs_entity.dart b/lib/core/note_fs_entity.dart
new file mode 100644
index 00000000..607c05d7
--- /dev/null
+++ b/lib/core/note_fs_entity.dart
@@ -0,0 +1,22 @@
+import 'note.dart';
+import 'note_folder.dart';
+
+// FIXME: Maybe the parent should be a part of the Note, and the NoteFolder
+//        or maybe also a part of the NoteFolder
+class NoteFSEntity {
+  NoteFolder parent;
+  NoteFolder folder;
+  Note note;
+
+  NoteFSEntity(this.parent, {this.folder, this.note}) {
+    assert(folder != null || note != null);
+  }
+
+  bool get isNote {
+    return note != null;
+  }
+
+  bool get isFolder {
+    return folder != null;
+  }
+}