diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 73953bb1ab5..a9bc4e7e6f0 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -90,6 +90,7 @@ class GatewayError < RuntimeError; end
 require 'spree/core/stock_configuration'
 require 'spree/core/validators/email'
 require 'spree/permission_sets'
+require 'spree/user_class_handle'
 
 require 'spree/preferences/store'
 require 'spree/preferences/static_model_preferences'
diff --git a/core/app/models/spree/user_class_handle.rb b/core/lib/spree/user_class_handle.rb
similarity index 100%
rename from core/app/models/spree/user_class_handle.rb
rename to core/lib/spree/user_class_handle.rb