diff --git a/lib/open_food_network/permalink_generator.rb b/app/models/concerns/permalink_generator.rb
similarity index 100%
rename from lib/open_food_network/permalink_generator.rb
rename to app/models/concerns/permalink_generator.rb
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 1c3b435d9e..6054043bf0 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'open_food_network/locking'
-require 'open_food_network/permalink_generator'
 require 'spree/core/s3_support'
 
 class EnterpriseGroup < ApplicationRecord
   include PermalinkGenerator
+  include Spree::Core::S3Support
+
   acts_as_list
 
   has_and_belongs_to_many :enterprises, join_table: 'enterprise_groups_enterprises'
@@ -39,7 +40,6 @@ class EnterpriseGroup < ApplicationRecord
   validates_attachment_content_type :logo, content_type: %r{\Aimage/.*\Z}
   validates_attachment_content_type :promo_image, content_type: %r{\Aimage/.*\Z}
 
-  include Spree::Core::S3Support
   supports_s3 :logo
   supports_s3 :promo_image
 
diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb
index dc8ba0c7a9..60f61b4fe9 100755
--- a/app/models/spree/product.rb
+++ b/app/models/spree/product.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'open_food_network/permalink_generator'
 require 'open_food_network/property_merge'
 require 'concerns/product_stock'