diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f2832c3..9950445 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,17 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-06-16 18:17:35 UTC using RuboCop version 1.50.2.
+# on 2024-05-17 10:11:09 UTC using RuboCop version 1.63.5.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'lib/modulesync/renderer.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
@@ -28,55 +22,50 @@ Performance/StringInclude:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/BeEq:
   Exclude:
-    - 'spec/unit/modulesync/settings_spec.rb'
+    - 'spec/unit/module_sync/settings_spec.rb'
 
 # Offense count: 3
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync_spec.rb'
 
 # Offense count: 17
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
-    - 'spec/unit/modulesync/git_service/factory_spec.rb'
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync/git_service_spec.rb'
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/factory_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync/git_service_spec.rb'
+    - 'spec/unit/module_sync/settings_spec.rb'
+    - 'spec/unit/module_sync/source_code_spec.rb'
+    - 'spec/unit/module_sync_spec.rb'
 
 # Offense count: 11
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 16
 
-# Offense count: 7
+# Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
-    - 'spec/unit/modulesync/git_service/factory_spec.rb'
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync/git_service_spec.rb'
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
 
 # Offense count: 19
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
 
 # Offense count: 7
 # Configuration parameters: .
@@ -93,20 +82,29 @@ RSpec/MultipleExpectations:
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
-    - 'spec/unit/modulesync/settings_spec.rb'
-    - 'spec/unit/modulesync/source_code_spec.rb'
+    - 'spec/unit/module_sync/settings_spec.rb'
+    - 'spec/unit/module_sync/source_code_spec.rb'
 
 # Offense count: 9
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 5
 
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+
 # Offense count: 6
 RSpec/StubbedMock:
   Exclude:
-    - 'spec/unit/modulesync/git_service/github_spec.rb'
-    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
-    - 'spec/unit/modulesync_spec.rb'
+    - 'spec/unit/module_sync/git_service/github_spec.rb'
+    - 'spec/unit/module_sync/git_service/gitlab_spec.rb'
+    - 'spec/unit/module_sync_spec.rb'
 
 # Offense count: 9
 # Configuration parameters: AllowedConstants.
@@ -135,12 +133,6 @@ Style/FetchEnvVar:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'lib/modulesync/renderer.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
diff --git a/modulesync.gemspec b/modulesync.gemspec
index c7aa8ca..fe3e078 100644
--- a/modulesync.gemspec
+++ b/modulesync.gemspec
@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
 
   spec.add_runtime_dependency 'git', '~>1.7'
   spec.add_runtime_dependency 'gitlab', '~>4.0'
   spec.add_runtime_dependency 'octokit', '>=4', '<9'
   spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 8'
-  spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'thor', '1.3.0'
 end
diff --git a/spec/unit/modulesync/git_service/factory_spec.rb b/spec/unit/module_sync/git_service/factory_spec.rb
similarity index 100%
rename from spec/unit/modulesync/git_service/factory_spec.rb
rename to spec/unit/module_sync/git_service/factory_spec.rb
diff --git a/spec/unit/modulesync/git_service/github_spec.rb b/spec/unit/module_sync/git_service/github_spec.rb
similarity index 100%
rename from spec/unit/modulesync/git_service/github_spec.rb
rename to spec/unit/module_sync/git_service/github_spec.rb
diff --git a/spec/unit/modulesync/git_service/gitlab_spec.rb b/spec/unit/module_sync/git_service/gitlab_spec.rb
similarity index 100%
rename from spec/unit/modulesync/git_service/gitlab_spec.rb
rename to spec/unit/module_sync/git_service/gitlab_spec.rb
diff --git a/spec/unit/modulesync/git_service_spec.rb b/spec/unit/module_sync/git_service_spec.rb
similarity index 100%
rename from spec/unit/modulesync/git_service_spec.rb
rename to spec/unit/module_sync/git_service_spec.rb
diff --git a/spec/unit/modulesync/settings_spec.rb b/spec/unit/module_sync/settings_spec.rb
similarity index 100%
rename from spec/unit/modulesync/settings_spec.rb
rename to spec/unit/module_sync/settings_spec.rb
diff --git a/spec/unit/modulesync/source_code_spec.rb b/spec/unit/module_sync/source_code_spec.rb
similarity index 100%
rename from spec/unit/modulesync/source_code_spec.rb
rename to spec/unit/module_sync/source_code_spec.rb
diff --git a/spec/unit/modulesync_spec.rb b/spec/unit/module_sync_spec.rb
similarity index 100%
rename from spec/unit/modulesync_spec.rb
rename to spec/unit/module_sync_spec.rb