1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 7031c67539..87de480263 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -47,8 +47,15 @@ module ActiveRecord
     autoload :AttributeMethods
     autoload :Attributes
     autoload :AutosaveAssociation
+
     autoload :Relation
-    autoload :RelationalCalculations
+
+    autoload_under 'relation' do
+      autoload :QueryMethods
+      autoload :FinderMethods
+      autoload :CalculationMethods
+    end
+
     autoload :Base
     autoload :Batches
     autoload :Calculations