diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 324f7c7bf..d66ab63ea 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-07 06:44:31 -0700 using RuboCop version 0.57.1.
+# on 2018-10-03 14:24:25 -0500 using RuboCop version 0.57.2.
 # 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
@@ -56,7 +56,7 @@ Layout/SpaceInsideArrayLiteralBrackets:
   Exclude:
     - 'config/environments/production.rb'
 
-# Offense count: 27
+# Offense count: 21
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -65,7 +65,6 @@ Layout/TrailingWhitespace:
     - 'app/controllers/sdr_controller.rb'
     - 'app/controllers/workflows_controller.rb'
     - 'config/routes.rb'
-    - 'spec/controllers/sdr_controller_spec.rb'
     - 'spec/support/auth_helper.rb'
 
 # Offense count: 1
@@ -82,7 +81,7 @@ Lint/HandleExceptions:
 # Configuration parameters: MaximumRangeSize.
 Lint/MissingCopEnableDirective:
   Exclude:
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 2
 Lint/UriEscapeUnescape:
@@ -110,7 +109,7 @@ Naming/AccessorMethodName:
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'app/models/dor/goobi.rb'
-    - 'spec/goobi_spec.rb'
+    - 'spec/dor/goobi_spec.rb'
 
 # Offense count: 2
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
@@ -131,7 +130,7 @@ RSpec/AnyInstance:
   Exclude:
     - 'spec/controllers/objects_controller_spec.rb'
     - 'spec/controllers/workflows_controller_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 1
 RSpec/BeforeAfterAll:
@@ -139,7 +138,7 @@ RSpec/BeforeAfterAll:
     - 'spec/spec_helper.rb'
     - 'spec/rails_helper.rb'
     - 'spec/support/**/*.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 13
 # Configuration parameters: Prefixes.
@@ -148,7 +147,7 @@ RSpec/ContextWording:
   Exclude:
     - 'spec/controllers/objects_controller_spec.rb'
     - 'spec/controllers/sdr_controller_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 1
 RSpec/DescribeClass:
@@ -160,24 +159,24 @@ RSpec/DescribeClass:
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
-    - 'spec/goobi_spec.rb'
-    - 'spec/registration_response_spec.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/goobi_spec.rb'
+    - 'spec/dor/registration_response_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 8
 RSpec/EmptyLineAfterFinalLet:
   Exclude:
     - 'spec/controllers/sdr_controller_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
     - 'spec/models/symphony_reader_spec.rb'
-    - 'spec/update_marc_spec.rb'
 
 # Offense count: 1
 RSpec/EmptyLineAfterSubject:
   Exclude:
     - 'spec/models/symphony_reader_spec.rb'
 
-# Offense count: 18
+# Offense count: 26
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Exclude:
@@ -185,32 +184,23 @@ RSpec/ExampleLength:
     - 'spec/controllers/sdr_controller_spec.rb'
     - 'spec/controllers/versions_controller_spec.rb'
     - 'spec/controllers/workflows_controller_spec.rb'
-    - 'spec/goobi_spec.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/goobi_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 1
 RSpec/ExpectInHook:
   Exclude:
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
-  Exclude:
-    - 'spec/goobi_spec.rb'
-    - 'spec/registration_response_spec.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
-
-# Offense count: 126
+# Offense count: 141
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
-    - 'spec/goobi_spec.rb'
-    - 'spec/registration_response_spec.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/goobi_spec.rb'
+    - 'spec/dor/registration_response_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 26
 # Configuration parameters: EnforcedStyle.
@@ -220,10 +210,10 @@ RSpec/MessageSpies:
     - 'spec/controllers/objects_controller_spec.rb'
     - 'spec/controllers/versions_controller_spec.rb'
     - 'spec/controllers/workflows_controller_spec.rb'
-    - 'spec/goobi_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/goobi_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
-# Offense count: 42
+# Offense count: 47
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 6
@@ -233,7 +223,7 @@ RSpec/MultipleExpectations:
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Exclude:
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
@@ -254,9 +244,9 @@ RSpec/ScatteredSetup:
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/controllers/objects_controller_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
     - 'spec/rails_helper.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
 
 # Offense count: 3
 # Configuration parameters: EnforcedStyle.
@@ -267,7 +257,7 @@ Rails/FilePath:
     - 'config/environments/development.rb'
     - 'spec/rails_helper.rb'
 
-# Offense count: 12
+# Offense count: 11
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -277,8 +267,6 @@ Style/Documentation:
     - 'app/controllers/sdr_controller.rb'
     - 'app/controllers/versions_controller.rb'
     - 'app/controllers/workflows_controller.rb'
-    - 'app/models/dor/goobi.rb'
-    - 'app/models/dor/goobi_tag.rb'
     - 'app/models/dor/registration_response.rb'
     - 'app/models/dor/service_item.rb'
     - 'app/models/dor/update_marc_record_service.rb'
@@ -320,9 +308,9 @@ Style/HashSyntax:
     - 'app/models/dor/goobi.rb'
     - 'spec/controllers/objects_controller_spec.rb'
     - 'spec/controllers/versions_controller_spec.rb'
+    - 'spec/dor/registration_response_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
     - 'spec/rails_helper.rb'
-    - 'spec/registration_response_spec.rb'
-    - 'spec/service_item_spec.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -351,8 +339,8 @@ Style/PercentLiteralDelimiters:
     - 'config/deploy/stage.rb'
     - 'config/initializers/okcomputer.rb'
     - 'config/spring.rb'
-    - 'spec/service_item_spec.rb'
-    - 'spec/update_marc_spec.rb'
+    - 'spec/dor/service_item_spec.rb'
+    - 'spec/dor/update_marc_record_service_spec.rb'
 
 # Offense count: 12
 # Cop supports --auto-correct.
diff --git a/spec/goobi_spec.rb b/spec/dor/goobi_spec.rb
similarity index 100%
rename from spec/goobi_spec.rb
rename to spec/dor/goobi_spec.rb
diff --git a/spec/registration_response_spec.rb b/spec/dor/registration_response_spec.rb
similarity index 100%
rename from spec/registration_response_spec.rb
rename to spec/dor/registration_response_spec.rb
diff --git a/spec/service_item_spec.rb b/spec/dor/service_item_spec.rb
similarity index 100%
rename from spec/service_item_spec.rb
rename to spec/dor/service_item_spec.rb
diff --git a/spec/update_marc_spec.rb b/spec/dor/update_marc_record_service_spec.rb
similarity index 100%
rename from spec/update_marc_spec.rb
rename to spec/dor/update_marc_record_service_spec.rb