diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml
index db3f6ffd48..e522ba7e80 100644
--- a/.rubocop_manual_todo.yml
+++ b/.rubocop_manual_todo.yml
@@ -154,7 +154,7 @@ Metrics/LineLength:
   - lib/open_food_network/available_payment_method_filter.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/customers_report.rb
-  - lib/open_food_network/order_cycle_distributed_variants.rb
+  - app/services/order_cycle_distributed_variants.rb
   - lib/open_food_network/enterprise_fee_applicator.rb
   - lib/open_food_network/enterprise_fee_calculator.rb
   - lib/open_food_network/enterprise_issue_validator.rb
@@ -290,7 +290,7 @@ Metrics/LineLength:
   - spec/lib/open_food_network/bulk_coop_report_spec.rb
   - spec/lib/open_food_network/cached_products_renderer_spec.rb
   - spec/lib/open_food_network/customers_report_spec.rb
-  - spec/lib/open_food_network/order_cycle_distributed_variants.rb
+  - spec/services/order_cycle_distributed_variants.rb
   - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
   - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
   - spec/lib/open_food_network/enterprise_injection_data_spec.rb
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1d779ed3d8..0d335fa70b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -311,7 +311,7 @@ Layout/EmptyLinesAroundClassBody:
     - 'app/serializers/api/currency_config_serializer.rb'
     - 'app/serializers/api/product_serializer.rb'
     - 'lib/discourse/single_sign_on.rb'
-    - 'lib/open_food_network/order_cycle_distributed_variants.rb'
+    - 'app/services/order_cycle_distributed_variants.rb'
     - 'lib/open_food_network/lettuce_share_report.rb'
     - 'lib/open_food_network/order_and_distributor_report.rb'
     - 'lib/open_food_network/rack_request_blocker.rb'
@@ -1901,7 +1901,7 @@ Style/MethodDefParentheses:
   Exclude:
     - 'app/helpers/enterprises_helper.rb'
     - 'app/models/spree/product_decorator.rb'
-    - 'lib/open_food_network/order_cycle_distributed_variants.rb'
+    - 'app/services/order_cycle_distributed_variants.rb'
     - 'lib/open_food_network/feature_toggle.rb'
     - 'lib/open_food_network/group_buy_report.rb'
     - 'spec/support/request/authentication_workflow.rb'
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 14c52be1a6..f2e405dc38 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -1,5 +1,4 @@
 require 'open_food_network/enterprise_fee_calculator'
-require 'open_food_network/order_cycle_distributed_variants'
 require 'open_food_network/feature_toggle'
 require 'open_food_network/tag_rule_applicator'
 require 'concerns/order_shipment'
diff --git a/lib/open_food_network/order_cycle_distributed_variants.rb b/app/services/order_cycle_distributed_variants.rb
similarity index 100%
rename from lib/open_food_network/order_cycle_distributed_variants.rb
rename to app/services/order_cycle_distributed_variants.rb
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
index 5deadc4b52..8e613088be 100644
--- a/knapsack_rspec_report.json
+++ b/knapsack_rspec_report.json
@@ -164,7 +164,7 @@
   "spec/serializers/admin/for_order_cycle/enterprise_serializer_spec.rb": 0.7021048069000244,
   "spec/features/admin/tax_settings_spec.rb": 0.4577906131744385,
   "spec/models/spree/product_property_spec.rb": 0.4479696750640869,
-  "spec/lib/open_food_network/order_cycle_distributed_variants_spec.rb": 0.2241048812866211,
+  "spec/services/order_cycle_distributed_variants_spec.rb": 0.2241048812866211,
   "spec/models/spree/option_value_spec.rb": 0.5916051864624023,
   "spec/controllers/spree/api/line_items_controller_spec.rb": 0.5350861549377441,
   "spec/helpers/order_cycles_helper_spec.rb": 0.40488767623901367,
diff --git a/spec/lib/open_food_network/order_cycle_distributed_variants_spec.rb b/spec/services/order_cycle_distributed_variants_spec.rb
similarity index 96%
rename from spec/lib/open_food_network/order_cycle_distributed_variants_spec.rb
rename to spec/services/order_cycle_distributed_variants_spec.rb
index 0c4a0d2d3d..f8f2c65772 100644
--- a/spec/lib/open_food_network/order_cycle_distributed_variants_spec.rb
+++ b/spec/services/order_cycle_distributed_variants_spec.rb
@@ -1,4 +1,4 @@
-require 'open_food_network/order_cycle_distributed_variants'
+require 'spec_helper'
 
 describe OrderCycleDistributedVariants do
   let(:order) { double(:order) }