diff --git a/lib/screens/folder_view.dart b/lib/folder_views/folder_view.dart
similarity index 100%
rename from lib/screens/folder_view.dart
rename to lib/folder_views/folder_view.dart
diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart
index 4a09eb3a..aead84c6 100644
--- a/lib/screens/folder_listing.dart
+++ b/lib/screens/folder_listing.dart
@@ -21,13 +21,13 @@ import 'package:provider/provider.dart';
 
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
+import 'package:gitjournal/folder_views/folder_view.dart';
 import 'package:gitjournal/repository.dart';
 import 'package:gitjournal/settings/app_settings.dart';
 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/widgets/rename_dialog.dart';
-import 'folder_view.dart';
 
 class FolderListingScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 2377de97..998350e1 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
 import 'package:gitjournal/core/flattened_notes_folder.dart';
 import 'package:gitjournal/core/notes_folder.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
-import 'folder_view.dart';
+import 'package:gitjournal/folder_views/folder_view.dart';
 
 class HomeScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/tag_listing.dart b/lib/screens/tag_listing.dart
index db72edb4..07d7ab5e 100644
--- a/lib/screens/tag_listing.dart
+++ b/lib/screens/tag_listing.dart
@@ -1,5 +1,3 @@
-
-
 import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
@@ -11,7 +9,7 @@ import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/note_serializer.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
 import 'package:gitjournal/features.dart';
-import 'package:gitjournal/screens/folder_view.dart';
+import 'package:gitjournal/folder_views/folder_view.dart';
 import 'package:gitjournal/widgets/app_bar_menu_button.dart';
 import 'package:gitjournal/widgets/app_drawer.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';