diff --git a/lib/app.dart b/lib/app.dart
index 5a8b7412..64f0a218 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -20,10 +20,10 @@ import 'package:gitjournal/themes.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:dynamic_theme/dynamic_theme.dart';
 
-import 'screens/githostsetup_screens.dart';
 import 'screens/home_screen.dart';
 import 'screens/onboarding_screens.dart';
 import 'screens/settings_screen.dart';
+import 'setup/screens.dart';
 
 class JournalApp extends StatelessWidget {
   static Future main(SharedPreferences pref) async {
diff --git a/lib/screens/settings_git_remote.dart b/lib/screens/settings_git_remote.dart
index 2630badf..8e492bac 100644
--- a/lib/screens/settings_git_remote.dart
+++ b/lib/screens/settings_git_remote.dart
@@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
 import 'package:fimber/fimber.dart';
 
 import 'package:git_bindings/git_bindings.dart';
-import 'package:gitjournal/screens/githostsetup_sshkey.dart';
+import 'package:gitjournal/setup/sshkey.dart';
 import 'package:gitjournal/screens/settings_widgets.dart';
 import 'package:gitjournal/settings.dart';
 import 'package:gitjournal/utils.dart';
diff --git a/lib/screens/githostsetup_autoconfigure.dart b/lib/setup/autoconfigure.dart
similarity index 97%
rename from lib/screens/githostsetup_autoconfigure.dart
rename to lib/setup/autoconfigure.dart
index 6d1fe81a..dd97bfd9 100644
--- a/lib/screens/githostsetup_autoconfigure.dart
+++ b/lib/setup/autoconfigure.dart
@@ -10,9 +10,9 @@ import 'package:gitjournal/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/settings.dart';
 
-import 'githostsetup_button.dart';
-import 'githostsetup_error.dart';
-import 'githostsetup_loading.dart';
+import 'button.dart';
+import 'error.dart';
+import 'loading.dart';
 
 class GitHostSetupAutoConfigure extends StatefulWidget {
   final GitHostType gitHostType;
diff --git a/lib/screens/githostsetup_button.dart b/lib/setup/button.dart
similarity index 100%
rename from lib/screens/githostsetup_button.dart
rename to lib/setup/button.dart
diff --git a/lib/screens/githostsetup_clone.dart b/lib/setup/clone.dart
similarity index 85%
rename from lib/screens/githostsetup_clone.dart
rename to lib/setup/clone.dart
index 16817389..26ca41fa 100644
--- a/lib/screens/githostsetup_clone.dart
+++ b/lib/setup/clone.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'githostsetup_error.dart';
-import 'githostsetup_loading.dart';
+import 'error.dart';
+import 'loading.dart';
 
 class GitHostSetupGitClone extends StatelessWidget {
   final String errorMessage;
diff --git a/lib/screens/githostsetup_clone_url.dart b/lib/setup/clone_url.dart
similarity index 99%
rename from lib/screens/githostsetup_clone_url.dart
rename to lib/setup/clone_url.dart
index ff7a5fdd..7acfa688 100644
--- a/lib/screens/githostsetup_clone_url.dart
+++ b/lib/setup/clone_url.dart
@@ -4,7 +4,7 @@ import 'package:git_url_parse2/git_url_parse2.dart';
 import 'package:function_types/function_types.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 
-import 'githostsetup_button.dart';
+import 'button.dart';
 
 class GitCloneUrlPage extends StatefulWidget {
   final Func1<String, void> doneFunction;
diff --git a/lib/screens/githostsetup_error.dart b/lib/setup/error.dart
similarity index 100%
rename from lib/screens/githostsetup_error.dart
rename to lib/setup/error.dart
diff --git a/lib/screens/githostsetup_loading.dart b/lib/setup/loading.dart
similarity index 100%
rename from lib/screens/githostsetup_loading.dart
rename to lib/setup/loading.dart
diff --git a/lib/screens/githostsetup_screens.dart b/lib/setup/screens.dart
similarity index 98%
rename from lib/screens/githostsetup_screens.dart
rename to lib/setup/screens.dart
index 467291c1..0509dc3a 100644
--- a/lib/screens/githostsetup_screens.dart
+++ b/lib/setup/screens.dart
@@ -17,11 +17,11 @@ import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'githostsetup_autoconfigure.dart';
-import 'githostsetup_button.dart';
-import 'githostsetup_clone.dart';
-import 'githostsetup_clone_url.dart';
-import 'githostsetup_sshkey.dart';
+import 'autoconfigure.dart';
+import 'button.dart';
+import 'clone.dart';
+import 'clone_url.dart';
+import 'sshkey.dart';
 
 class GitHostSetupScreen extends StatefulWidget {
   final Func0<void> onCompletedFunction;
diff --git a/lib/screens/githostsetup_sshkey.dart b/lib/setup/sshkey.dart
similarity index 98%
rename from lib/screens/githostsetup_sshkey.dart
rename to lib/setup/sshkey.dart
index 62f1217d..355f9ef6 100644
--- a/lib/screens/githostsetup_sshkey.dart
+++ b/lib/setup/sshkey.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:function_types/function_types.dart';
 
-import 'githostsetup_button.dart';
-import 'githostsetup_loading.dart';
+import 'button.dart';
+import 'loading.dart';
 
 class GitHostSetupSshKeyKnownProvider extends StatelessWidget {
   final Func0<void> doneFunction;