diff --git a/.rubocop.yml b/.rubocop.yml
index 7bc933f1..0f83714d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -304,6 +304,6 @@ RSpec/Eq: # new in 2.24
 RSpec/MetadataStyle: # new in 2.24
   Enabled: true
 RSpec/SpecFilePathFormat: # new in 2.24
-  Enabled: false  # NOTE: we made a spec path shorter
+  Enabled: true
 RSpec/SpecFilePathSuffix: # new in 2.24
   Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 00c2d99a..4b3fbda5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -60,26 +60,26 @@ Metrics/PerceivedComplexity:
 # Offense count: 5
 RSpec/AnyInstance:
   Exclude:
-    - 'spec/robots/assembly/jp2_create_spec.rb'
+    - 'spec/robots/dor_repo/assembly/jp2_create_spec.rb'
 
 # Offense count: 4
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
   Exclude:
-    - 'spec/robots/assembly/checksum_compute_spec.rb'
-    - 'spec/robots/assembly/exif_collect_spec.rb'
-    - 'spec/robots/assembly/jp2_create_spec.rb'
+    - 'spec/robots/dor_repo/assembly/checksum_compute_spec.rb'
+    - 'spec/robots/dor_repo/assembly/exif_collect_spec.rb'
+    - 'spec/robots/dor_repo/assembly/jp2_create_spec.rb'
 
 # Offense count: 19
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   Exclude:
-    - 'spec/robots/assembly/checksum_compute_spec.rb'
-    - 'spec/robots/assembly/content_metadata_create_spec.rb'
-    - 'spec/robots/assembly/exif_collect_spec.rb'
-    - 'spec/robots/assembly/jp2_create_spec.rb'
-    - 'spec/robots/release/release_members_spec.rb'
+    - 'spec/robots/dor_repo/assembly/checksum_compute_spec.rb'
+    - 'spec/robots/dor_repo/assembly/content_metadata_create_spec.rb'
+    - 'spec/robots/dor_repo/assembly/exif_collect_spec.rb'
+    - 'spec/robots/dor_repo/assembly/jp2_create_spec.rb'
+    - 'spec/robots/dor_repo/release/release_members_spec.rb'
 
 # Offense count: 66
 # Configuration parameters: AllowSubject, Max.
@@ -87,21 +87,21 @@ RSpec/MultipleMemoizedHelpers:
   Exclude:
     - 'spec/lib/dor/assembly/content_metadata_from_stub/structural_builder_spec.rb'
     - 'spec/lib/preserved_file_uris_spec.rb'
-    - 'spec/robots/accession/end_accession_spec.rb'
-    - 'spec/robots/accession/shelve_spec.rb'
-    - 'spec/robots/accession/technical_metadata_spec.rb'
-    - 'spec/robots/assembly/accessioning_initiate_spec.rb'
-    - 'spec/robots/assembly/checksum_compute_spec.rb'
-    - 'spec/robots/assembly/content_metadata_create_spec.rb'
-    - 'spec/robots/assembly/exif_collect_spec.rb'
-    - 'spec/robots/assembly/jp2_create_spec.rb'
-    - 'spec/robots/release/release_members_spec.rb'
+    - 'spec/robots/dor_repo/accession/end_accession_spec.rb'
+    - 'spec/robots/dor_repo/accession/shelve_spec.rb'
+    - 'spec/robots/dor_repo/accession/technical_metadata_spec.rb'
+    - 'spec/robots/dor_repo/assembly/accessioning_initiate_spec.rb'
+    - 'spec/robots/dor_repo/assembly/checksum_compute_spec.rb'
+    - 'spec/robots/dor_repo/assembly/content_metadata_create_spec.rb'
+    - 'spec/robots/dor_repo/assembly/exif_collect_spec.rb'
+    - 'spec/robots/dor_repo/assembly/jp2_create_spec.rb'
+    - 'spec/robots/dor_repo/release/release_members_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
-    - 'spec/robots/assembly/exif_collect_spec.rb'
+    - 'spec/robots/dor_repo/assembly/exif_collect_spec.rb'
 
 # Offense count: 11
 # Configuration parameters: AllowedConstants.
diff --git a/spec/robots/accession/content_metadata_spec.rb b/spec/robots/dor_repo/accession/content_metadata_spec.rb
similarity index 100%
rename from spec/robots/accession/content_metadata_spec.rb
rename to spec/robots/dor_repo/accession/content_metadata_spec.rb
diff --git a/spec/robots/accession/descriptive_metadata_spec.rb b/spec/robots/dor_repo/accession/descriptive_metadata_spec.rb
similarity index 100%
rename from spec/robots/accession/descriptive_metadata_spec.rb
rename to spec/robots/dor_repo/accession/descriptive_metadata_spec.rb
diff --git a/spec/robots/accession/end_accession_spec.rb b/spec/robots/dor_repo/accession/end_accession_spec.rb
similarity index 100%
rename from spec/robots/accession/end_accession_spec.rb
rename to spec/robots/dor_repo/accession/end_accession_spec.rb
diff --git a/spec/robots/accession/publish_spec.rb b/spec/robots/dor_repo/accession/publish_spec.rb
similarity index 100%
rename from spec/robots/accession/publish_spec.rb
rename to spec/robots/dor_repo/accession/publish_spec.rb
diff --git a/spec/robots/accession/reset_workspace_spec.rb b/spec/robots/dor_repo/accession/reset_workspace_spec.rb
similarity index 100%
rename from spec/robots/accession/reset_workspace_spec.rb
rename to spec/robots/dor_repo/accession/reset_workspace_spec.rb
diff --git a/spec/robots/accession/sdr_ingest_transfer_spec.rb b/spec/robots/dor_repo/accession/sdr_ingest_transfer_spec.rb
similarity index 100%
rename from spec/robots/accession/sdr_ingest_transfer_spec.rb
rename to spec/robots/dor_repo/accession/sdr_ingest_transfer_spec.rb
diff --git a/spec/robots/accession/shelve_spec.rb b/spec/robots/dor_repo/accession/shelve_spec.rb
similarity index 100%
rename from spec/robots/accession/shelve_spec.rb
rename to spec/robots/dor_repo/accession/shelve_spec.rb
diff --git a/spec/robots/accession/technical_metadata_spec.rb b/spec/robots/dor_repo/accession/technical_metadata_spec.rb
similarity index 100%
rename from spec/robots/accession/technical_metadata_spec.rb
rename to spec/robots/dor_repo/accession/technical_metadata_spec.rb
diff --git a/spec/robots/accession/update_doi_spec.rb b/spec/robots/dor_repo/accession/update_doi_spec.rb
similarity index 100%
rename from spec/robots/accession/update_doi_spec.rb
rename to spec/robots/dor_repo/accession/update_doi_spec.rb
diff --git a/spec/robots/accession/update_orcid_work_spec.rb b/spec/robots/dor_repo/accession/update_orcid_work_spec.rb
similarity index 100%
rename from spec/robots/accession/update_orcid_work_spec.rb
rename to spec/robots/dor_repo/accession/update_orcid_work_spec.rb
diff --git a/spec/robots/assembly/accessioning_initiate_spec.rb b/spec/robots/dor_repo/assembly/accessioning_initiate_spec.rb
similarity index 100%
rename from spec/robots/assembly/accessioning_initiate_spec.rb
rename to spec/robots/dor_repo/assembly/accessioning_initiate_spec.rb
diff --git a/spec/robots/assembly/checksum_compute_spec.rb b/spec/robots/dor_repo/assembly/checksum_compute_spec.rb
similarity index 100%
rename from spec/robots/assembly/checksum_compute_spec.rb
rename to spec/robots/dor_repo/assembly/checksum_compute_spec.rb
diff --git a/spec/robots/assembly/content_metadata_create_spec.rb b/spec/robots/dor_repo/assembly/content_metadata_create_spec.rb
similarity index 100%
rename from spec/robots/assembly/content_metadata_create_spec.rb
rename to spec/robots/dor_repo/assembly/content_metadata_create_spec.rb
diff --git a/spec/robots/assembly/exif_collect_spec.rb b/spec/robots/dor_repo/assembly/exif_collect_spec.rb
similarity index 100%
rename from spec/robots/assembly/exif_collect_spec.rb
rename to spec/robots/dor_repo/assembly/exif_collect_spec.rb
diff --git a/spec/robots/assembly/jp2_create_spec.rb b/spec/robots/dor_repo/assembly/jp2_create_spec.rb
similarity index 100%
rename from spec/robots/assembly/jp2_create_spec.rb
rename to spec/robots/dor_repo/assembly/jp2_create_spec.rb
diff --git a/spec/robots/dissemination/cleanup_spec.rb b/spec/robots/dor_repo/dissemination/cleanup_spec.rb
similarity index 100%
rename from spec/robots/dissemination/cleanup_spec.rb
rename to spec/robots/dor_repo/dissemination/cleanup_spec.rb
diff --git a/spec/robots/goobi_notify_spec.rb b/spec/robots/dor_repo/goobi/goobi_notify_spec.rb
similarity index 100%
rename from spec/robots/goobi_notify_spec.rb
rename to spec/robots/dor_repo/goobi/goobi_notify_spec.rb
diff --git a/spec/robots/release/release_members_spec.rb b/spec/robots/dor_repo/release/release_members_spec.rb
similarity index 100%
rename from spec/robots/release/release_members_spec.rb
rename to spec/robots/dor_repo/release/release_members_spec.rb
diff --git a/spec/robots/release/release_publish_spec.rb b/spec/robots/dor_repo/release/release_publish_spec.rb
similarity index 100%
rename from spec/robots/release/release_publish_spec.rb
rename to spec/robots/dor_repo/release/release_publish_spec.rb
diff --git a/spec/robots/release/update_marc_spec.rb b/spec/robots/dor_repo/release/update_marc_spec.rb
similarity index 100%
rename from spec/robots/release/update_marc_spec.rb
rename to spec/robots/dor_repo/release/update_marc_spec.rb