Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

activerecord/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/rails/generators/active_record/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/rails/generators/active_record/observer/observer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

railties/lib/rails/generators.rb

@@ -242,7 +242,7 @@ module Rails
         paths = namespaces_to_paths(namespaces)
 
         paths.each do |raw_path|
-          ["rails_generators", "generators"].each do |base|
+          ["rails/generators", "generators"].each do |base|
             path = "#{base}/#{raw_path}_generator"
 
             begin
@@ -265,7 +265,7 @@ module Rails
         load_generators_from_railties!
 
         $LOAD_PATH.each do |base|
-          Dir[File.join(base, "{generators,rails_generators}", "**", "*_generator.rb")].each do |path|
+          Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
             begin
               require path
             rescue Exception => e

railties/lib/rails/generators/base.rb

@@ -25,7 +25,7 @@ module Rails
       def self.source_root
         @_rails_source_root ||= begin
           if base_name && generator_name
-            File.expand_path(File.join("../../generators", base_name, generator_name, 'templates'), File.dirname(__FILE__))
+            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
           end
         end
       end

railties/lib/rails/generators/erb/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

railties/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb/controller/controller_generator'
+require 'rails/generators/erb/controller/controller_generator'
 
 module Erb
   module Generators

railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 require 'rails/generators/resource_helpers'
 
 module Erb

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -5,7 +5,7 @@ require 'rails/version' unless defined?(Rails::VERSION)
 module Rails::Generators
   # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
   # can change in Ruby 1.8.7 when we FileUtils.cd.
-  RAILS_DEV_PATH = File.expand_path("../../../../..", File.dirname(__FILE__))
+  RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
 
   RESERVED_NAMES = %w[generate console server dbconsole
                       application destroy benchmarker profiler