diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 1d1fa060..cf7427b7 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -1,8 +1,8 @@
 import 'package:badges/badges.dart';
 import 'package:flutter/material.dart';
 import 'package:journal/apis/git.dart';
-import 'package:journal/note_editor.dart';
-import 'package:journal/note_viewer.dart';
+import 'package:journal/screens/note_editor.dart';
+import 'package:journal/screens/note_viewer.dart';
 import 'package:journal/state_container.dart';
 import 'package:journal/widgets/app_drawer.dart';
 import 'package:journal/widgets/journal_list.dart';
diff --git a/lib/note_editor.dart b/lib/screens/note_editor.dart
similarity index 100%
rename from lib/note_editor.dart
rename to lib/screens/note_editor.dart
diff --git a/lib/note_viewer.dart b/lib/screens/note_viewer.dart
similarity index 98%
rename from lib/note_viewer.dart
rename to lib/screens/note_viewer.dart
index a2104ed4..0cdfcbce 100644
--- a/lib/note_viewer.dart
+++ b/lib/screens/note_viewer.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:journal/note.dart';
 import 'package:journal/state_container.dart';
+import 'package:journal/utils.dart';
 import 'package:journal/widgets/note_header.dart';
 
-import 'note.dart';
 import 'note_editor.dart';
-import 'utils.dart';
 
 class NoteBrowsingScreen extends StatefulWidget {
   final List<Note> notes;