diff --git a/lib/app_router.dart b/lib/app_router.dart
index e24bbca2..7a6f2145 100644
--- a/lib/app_router.dart
+++ b/lib/app_router.dart
@@ -27,7 +27,7 @@ import 'package:gitjournal/settings/app_config.dart';
 import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/settings/settings_screen.dart';
 import 'package:gitjournal/settings/storage_config.dart';
-import 'package:gitjournal/setup/screens.dart';
+import 'package:git_setup/screens.dart';
 import 'package:gitjournal/utils/utils.dart';
 
 class AppRoute {
diff --git a/lib/experiments/main_dashbook2.dart b/lib/experiments/main_dashbook2.dart
index 7dd8fe3e..9b8493b9 100644
--- a/lib/experiments/main_dashbook2.dart
+++ b/lib/experiments/main_dashbook2.dart
@@ -16,7 +16,7 @@ import 'package:gitjournal/logger/fakes/debug_screen_fake.dart';
 import 'package:gitjournal/logger/fakes/fake_path_provider.dart';
 import 'package:gitjournal/logger/logger.dart';
 import 'package:gitjournal/settings/app_config.dart';
-import 'package:gitjournal/setup/fakes/clone_fake.dart';
+import 'package:git_setup/fakes/clone_fake.dart';
 
 Future<void> main() async {
   dynamic _;
diff --git a/lib/settings/settings_git_remote.dart b/lib/settings/settings_git_remote.dart
index 80d3a713..a5446e16 100644
--- a/lib/settings/settings_git_remote.dart
+++ b/lib/settings/settings_git_remote.dart
@@ -19,8 +19,8 @@ import 'package:gitjournal/settings/git_config.dart';
 import 'package:gitjournal/settings/settings.dart';
 import 'package:gitjournal/settings/storage_config.dart';
 import 'package:gitjournal/settings/widgets/settings_list_preference.dart';
-import 'package:gitjournal/setup/screens.dart';
-import 'package:gitjournal/setup/sshkey.dart';
+import 'package:git_setup/screens.dart';
+import 'package:git_setup/sshkey.dart';
 import 'package:gitjournal/ssh/keygen.dart';
 import 'package:gitjournal/utils/utils.dart';
 import 'package:gitjournal/widgets/future_builder_with_progress.dart';
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 272fe793..d10e7453 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -31,7 +31,7 @@ import 'package:gitjournal/screens/tag_listing.dart';
 import 'package:gitjournal/settings/app_config.dart';
 import 'package:gitjournal/settings/bug_report.dart';
 import 'package:gitjournal/settings/settings_screen.dart';
-import 'package:gitjournal/setup/screens.dart';
+import 'package:git_setup/screens.dart';
 import 'package:gitjournal/widgets/app_drawer_header.dart';
 import 'package:gitjournal/widgets/pro_overlay.dart';
 
diff --git a/packages/git_setup/analysis_options.yaml b/packages/git_setup/analysis_options.yaml
index a5744c1c..50862cb3 100644
--- a/packages/git_setup/analysis_options.yaml
+++ b/packages/git_setup/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:flutter_lints/flutter.yaml
+# include: package:flutter_lints/flutter.yaml
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/packages/git_setup/lib/.gitignore b/packages/git_setup/lib/.gitignore
new file mode 100644
index 00000000..96486fd9
--- /dev/null
+++ b/packages/git_setup/lib/.gitignore
@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/
diff --git a/lib/setup/autoconfigure.dart b/packages/git_setup/lib/autoconfigure.dart
similarity index 100%
rename from lib/setup/autoconfigure.dart
rename to packages/git_setup/lib/autoconfigure.dart
diff --git a/lib/setup/button.dart b/packages/git_setup/lib/button.dart
similarity index 100%
rename from lib/setup/button.dart
rename to packages/git_setup/lib/button.dart
diff --git a/lib/setup/clone.dart b/packages/git_setup/lib/clone.dart
similarity index 100%
rename from lib/setup/clone.dart
rename to packages/git_setup/lib/clone.dart
diff --git a/lib/setup/clone_auto_select.dart b/packages/git_setup/lib/clone_auto_select.dart
similarity index 100%
rename from lib/setup/clone_auto_select.dart
rename to packages/git_setup/lib/clone_auto_select.dart
diff --git a/lib/setup/clone_git_exec.dart b/packages/git_setup/lib/clone_git_exec.dart
similarity index 100%
rename from lib/setup/clone_git_exec.dart
rename to packages/git_setup/lib/clone_git_exec.dart
diff --git a/lib/setup/clone_libgit2.dart b/packages/git_setup/lib/clone_libgit2.dart
similarity index 100%
rename from lib/setup/clone_libgit2.dart
rename to packages/git_setup/lib/clone_libgit2.dart
diff --git a/lib/setup/clone_url.dart b/packages/git_setup/lib/clone_url.dart
similarity index 100%
rename from lib/setup/clone_url.dart
rename to packages/git_setup/lib/clone_url.dart
diff --git a/lib/setup/cloning.dart b/packages/git_setup/lib/cloning.dart
similarity index 100%
rename from lib/setup/cloning.dart
rename to packages/git_setup/lib/cloning.dart
diff --git a/lib/setup/error.dart b/packages/git_setup/lib/error.dart
similarity index 100%
rename from lib/setup/error.dart
rename to packages/git_setup/lib/error.dart
diff --git a/lib/setup/fakes/clone_fake.dart b/packages/git_setup/lib/fakes/clone_fake.dart
similarity index 100%
rename from lib/setup/fakes/clone_fake.dart
rename to packages/git_setup/lib/fakes/clone_fake.dart
diff --git a/lib/setup/git_transfer_progress.dart b/packages/git_setup/lib/git_transfer_progress.dart
similarity index 100%
rename from lib/setup/git_transfer_progress.dart
rename to packages/git_setup/lib/git_transfer_progress.dart
diff --git a/lib/setup/key_editors.dart b/packages/git_setup/lib/key_editors.dart
similarity index 100%
rename from lib/setup/key_editors.dart
rename to packages/git_setup/lib/key_editors.dart
diff --git a/lib/setup/loading.dart b/packages/git_setup/lib/loading.dart
similarity index 100%
rename from lib/setup/loading.dart
rename to packages/git_setup/lib/loading.dart
diff --git a/lib/setup/loading_error.dart b/packages/git_setup/lib/loading_error.dart
similarity index 100%
rename from lib/setup/loading_error.dart
rename to packages/git_setup/lib/loading_error.dart
diff --git a/lib/setup/repo_selector.dart b/packages/git_setup/lib/repo_selector.dart
similarity index 100%
rename from lib/setup/repo_selector.dart
rename to packages/git_setup/lib/repo_selector.dart
diff --git a/lib/setup/screens.dart b/packages/git_setup/lib/screens.dart
similarity index 100%
rename from lib/setup/screens.dart
rename to packages/git_setup/lib/screens.dart
diff --git a/lib/setup/screens_stories.dart b/packages/git_setup/lib/screens_stories.dart
similarity index 100%
rename from lib/setup/screens_stories.dart
rename to packages/git_setup/lib/screens_stories.dart
diff --git a/lib/setup/sshkey.dart b/packages/git_setup/lib/sshkey.dart
similarity index 100%
rename from lib/setup/sshkey.dart
rename to packages/git_setup/lib/sshkey.dart
diff --git a/packages/git_setup/pubspec.yaml b/packages/git_setup/pubspec.yaml
index 91dbceb0..52943aad 100644
--- a/packages/git_setup/pubspec.yaml
+++ b/packages/git_setup/pubspec.yaml
@@ -7,13 +7,24 @@ environment:
   sdk: ">=2.17.3 <3.0.0"
   flutter: ">=1.17.0"
 
+publish_to: none
+
 dependencies:
+  dots_indicator: ^2.0.0
+  easy_localization: ^3.0.0
+  function_types: ^0.1.0
+  provider: ^6.0.1
+  time: ^2.0.0
+  universal_io: ^2.0.4
+  url_launcher: ^6.0.3
+  gitjournal:
+    path: ../../
   flutter:
     sdk: flutter
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.0
+  # flutter_lints: ^2.0.0
 
 flutter:
diff --git a/pubspec.lock b/pubspec.lock
index 7fa5a164..84e873af 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -752,6 +752,13 @@ packages:
       url: "https://github.com/GitJournal/git_bindings.git"
     source: git
     version: "0.0.19"
+  git_setup:
+    dependency: "direct main"
+    description:
+      path: "packages/git_setup"
+      relative: true
+    source: path
+    version: "0.0.1"
   glob:
     dependency: transitive
     description:
@@ -1924,5 +1931,5 @@ packages:
     source: hosted
     version: "0.0.12"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=2.17.3 <3.0.0"
   flutter: ">=3.0.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index bd160e17..8b8af0d6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -70,6 +70,8 @@ dependencies:
   nested: ^1.0.0
   openssh_ed25519:
     path: packages/openssh_ed25519
+  git_setup:
+    path: packages/git_setup
   org_flutter: ^1.4.0
   package_info_plus: ^1.0.4
   path: ^1.8.0
diff --git a/test/setup/clone_test.dart b/test/setup/clone_test.dart
index e3029e92..eb4566a6 100644
--- a/test/setup/clone_test.dart
+++ b/test/setup/clone_test.dart
@@ -10,10 +10,10 @@ import 'package:dart_git/dart_git.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
-import 'package:gitjournal/setup/clone_git_exec.dart';
+import 'package:git_setup/clone_git_exec.dart';
 import '../lib.dart';
 
-// import 'package:gitjournal/setup/clone_libgit2.dart';
+// import 'package:git_setup/clone_libgit2.dart';
 
 const emptyRepoHttp = "https://github.com/GitJournal/empty_repo.git";
 
diff --git a/test/setup/git_transfer_progress_test.dart b/test/setup/git_transfer_progress_test.dart
index 7bda8b9c..cc5c27aa 100644
--- a/test/setup/git_transfer_progress_test.dart
+++ b/test/setup/git_transfer_progress_test.dart
@@ -6,7 +6,7 @@
 
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:gitjournal/setup/git_transfer_progress.dart';
+import 'package:git_setup/git_transfer_progress.dart';
 import '../lib.dart';
 
 void main() {