Move railties/lib/* into railties/lib/*

rails · Sep 24, 2009 · f0dd77c · f0dd77c · carllerche · Sep 24, 2009
1 parent 610b81b
commit f0dd77c
Show file tree

Hide file tree

Showing 291 changed files with 141 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,6 @@ railties/guides/output
 *.swp
 *.swo
 actionpack/bin
-*/vendor/gems
+vendor/gems/
+*/vendor/gems/
+bin/
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/conversions'
+require "rack/test"
 
 module ActionController #:nodoc:
   # Essentially generates a modified Tempfile object similar to the object

diff --git a/railties/Rakefile b/railties/Rakefile
@@ -81,7 +81,7 @@ end
 
 task :create_rails do
   require File.join(File.dirname(__FILE__), 'lib', 'generators')
-  require 'generators/rails/app/app_generator'
+  require 'rails/generators/rails/app/app_generator'
   Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ],
                                         :destination_root => File.expand_path(File.dirname(PKG_DESTINATION))
 end

diff --git a/railties/bin/rails b/railties/bin/rails
@@ -1,15 +1,25 @@
-require File.dirname(__FILE__) + '/../lib/ruby_version_check'
+begin
+  require 'rails/ruby_version_check'
+rescue LoadError
+  # If people are not using gems, the load path must still
+  # be correct.
+  # TODO: Remove the begin / rescue block somehow
+  $:.unshift File.dirname(__FILE__) + '/../lib'
+  $:.unshift File.dirname(__FILE__) + '/../../activesupport/lib'
+  retry
+end
+
 Signal.trap("INT") { puts; exit }
 
-require File.dirname(__FILE__) + '/../lib/rails/version'
+require 'rails/version'
 if %w(--version -v).include? ARGV.first
   puts "Rails #{Rails::VERSION::STRING}"
   exit(0)
 end
 
 ARGV << "--help" if ARGV.empty?
 
-require File.dirname(__FILE__) + '/../lib/generators'
+require 'rails/generators'
-require 'generators/rails/app/app_generator'
+require 'rails/generators/rails/app/app_generator'
 
 Rails::Generators::AppGenerator.start
diff --git a/railties/lib/code_statistics.rb → railties/lib/rails/code_statistics.rb b/railties/lib/code_statistics.rb → railties/lib/rails/code_statistics.rb
diff --git a/railties/lib/commands.rb → railties/lib/rails/commands.rb b/railties/lib/commands.rb → railties/lib/rails/commands.rb
diff --git a/railties/lib/commands/about.rb → railties/lib/rails/commands/about.rb b/railties/lib/commands/about.rb → railties/lib/rails/commands/about.rb
diff --git a/railties/lib/commands/console.rb → railties/lib/rails/commands/console.rb b/railties/lib/commands/console.rb → railties/lib/rails/commands/console.rb
@@ -13,9 +13,9 @@
 
 libs =  " -r irb/completion"
 libs << %( -r "#{RAILS_ROOT}/config/environment")
-libs << " -r console_app"
+libs << " -r rails/console_app"
-libs << " -r console_sandbox" if options[:sandbox]
+libs << " -r rails/console_sandbox" if options[:sandbox]
-libs << " -r console_with_helpers"
+libs << " -r rails/console_with_helpers"
 
 if options[:debugger]
   begin

diff --git a/railties/lib/commands/dbconsole.rb → railties/lib/rails/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb → railties/lib/rails/commands/dbconsole.rb
diff --git a/railties/lib/commands/destroy.rb → railties/lib/rails/commands/destroy.rb b/railties/lib/commands/destroy.rb → railties/lib/rails/commands/destroy.rb
diff --git a/railties/lib/commands/generate.rb → railties/lib/rails/commands/generate.rb b/railties/lib/commands/generate.rb → railties/lib/rails/commands/generate.rb
diff --git a/railties/lib/commands/ncgi/listener → railties/lib/rails/commands/ncgi/listener b/railties/lib/commands/ncgi/listener → railties/lib/rails/commands/ncgi/listener
diff --git a/railties/lib/commands/ncgi/tracker → railties/lib/rails/commands/ncgi/tracker b/railties/lib/commands/ncgi/tracker → railties/lib/rails/commands/ncgi/tracker
diff --git a/...s/lib/commands/performance/benchmarker.rb → ...rails/commands/performance/benchmarker.rb b/...s/lib/commands/performance/benchmarker.rb → ...rails/commands/performance/benchmarker.rb
diff --git a/...ties/lib/commands/performance/profiler.rb → ...ib/rails/commands/performance/profiler.rb b/...ties/lib/commands/performance/profiler.rb → ...ib/rails/commands/performance/profiler.rb
diff --git a/railties/lib/commands/plugin.rb → railties/lib/rails/commands/plugin.rb b/railties/lib/commands/plugin.rb → railties/lib/rails/commands/plugin.rb
diff --git a/railties/lib/commands/runner.rb → railties/lib/rails/commands/runner.rb b/railties/lib/commands/runner.rb → railties/lib/rails/commands/runner.rb
diff --git a/railties/lib/commands/server.rb → railties/lib/rails/commands/server.rb b/railties/lib/commands/server.rb → railties/lib/rails/commands/server.rb
diff --git a/railties/lib/commands/update.rb → railties/lib/rails/commands/update.rb b/railties/lib/commands/update.rb → railties/lib/rails/commands/update.rb
diff --git a/railties/lib/console_app.rb → railties/lib/rails/console_app.rb b/railties/lib/console_app.rb → railties/lib/rails/console_app.rb
diff --git a/railties/lib/console_sandbox.rb → railties/lib/rails/console_sandbox.rb b/railties/lib/console_sandbox.rb → railties/lib/rails/console_sandbox.rb
diff --git a/railties/lib/console_with_helpers.rb → railties/lib/rails/console_with_helpers.rb b/railties/lib/console_with_helpers.rb → railties/lib/rails/console_with_helpers.rb
diff --git a/railties/lib/dispatcher.rb → railties/lib/rails/dispatcher.rb b/railties/lib/dispatcher.rb → railties/lib/rails/dispatcher.rb
diff --git a/railties/lib/fcgi_handler.rb → railties/lib/rails/fcgi_handler.rb b/railties/lib/fcgi_handler.rb → railties/lib/rails/fcgi_handler.rb
@@ -1,6 +1,6 @@
 require 'fcgi'
 require 'logger'
-require 'dispatcher'
+require 'rails/dispatcher'
 require 'rbconfig'
 
 class RailsFCGIHandler

diff --git a/railties/lib/generators.rb → railties/lib/rails/generators.rb b/railties/lib/generators.rb → railties/lib/rails/generators.rb
@@ -8,10 +8,10 @@
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# TODO: Do not always push on vendored thor
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.11.6/lib")
-require 'generators/base'
+require 'rails/generators/base'
-require 'generators/named_base'
+require 'rails/generators/named_base'
 
 module Rails
   module Generators

diff --git a/railties/lib/generators/actions.rb → railties/lib/rails/generators/actions.rb b/railties/lib/generators/actions.rb → railties/lib/rails/generators/actions.rb
diff --git a/railties/lib/generators/active_model.rb → ...ties/lib/rails/generators/active_model.rb b/railties/lib/generators/active_model.rb → ...ties/lib/rails/generators/active_model.rb
diff --git a/railties/lib/generators/active_record.rb → ...ies/lib/rails/generators/active_record.rb b/railties/lib/generators/active_record.rb → ...ies/lib/rails/generators/active_record.rb
@@ -1,6 +1,6 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
-require 'generators/migration'
+require 'rails/generators/migration'
-require 'generators/active_model'
+require 'rails/generators/active_model'
 
 module ActiveRecord
   module Generators

diff --git a/...e_record/migration/migration_generator.rb → ...e_record/migration/migration_generator.rb b/...e_record/migration/migration_generator.rb → ...e_record/migration/migration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

diff --git a/...e_record/migration/templates/migration.rb → ...e_record/migration/templates/migration.rb b/...e_record/migration/templates/migration.rb → ...e_record/migration/templates/migration.rb
diff --git a/...rs/active_record/model/model_generator.rb → ...rs/active_record/model/model_generator.rb b/...rs/active_record/model/model_generator.rb → ...rs/active_record/model/model_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

diff --git a/...ctive_record/model/templates/migration.rb → ...ctive_record/model/templates/migration.rb b/...ctive_record/model/templates/migration.rb → ...ctive_record/model/templates/migration.rb
diff --git a/...rs/active_record/model/templates/model.rb → ...rs/active_record/model/templates/model.rb b/...rs/active_record/model/templates/model.rb → ...rs/active_record/model/templates/model.rb
diff --git a/...ive_record/observer/observer_generator.rb → ...ive_record/observer/observer_generator.rb b/...ive_record/observer/observer_generator.rb → ...ive_record/observer/observer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

diff --git a/...ive_record/observer/templates/observer.rb → ...ive_record/observer/templates/observer.rb b/...ive_record/observer/templates/observer.rb → ...ive_record/observer/templates/observer.rb
diff --git a/..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb b/..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

diff --git a/.../session_migration/templates/migration.rb → .../session_migration/templates/migration.rb b/.../session_migration/templates/migration.rb → .../session_migration/templates/migration.rb
diff --git a/railties/lib/generators/base.rb → railties/lib/rails/generators/base.rb b/railties/lib/generators/base.rb → railties/lib/rails/generators/base.rb
@@ -1,5 +1,5 @@
 require 'thor'
-require 'generators/actions'
+require 'rails/generators/actions'
 
 module Rails
   module Generators

diff --git a/railties/lib/generators/erb.rb → railties/lib/rails/generators/erb.rb b/railties/lib/generators/erb.rb → railties/lib/rails/generators/erb.rb
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
 
 module Erb
   module Generators

diff --git a/...rs/erb/controller/controller_generator.rb → ...rs/erb/controller/controller_generator.rb b/...rs/erb/controller/controller_generator.rb → ...rs/erb/controller/controller_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

diff --git a/...rs/erb/controller/templates/view.html.erb → ...rs/erb/controller/templates/view.html.erb b/...rs/erb/controller/templates/view.html.erb → ...rs/erb/controller/templates/view.html.erb
diff --git a/...generators/erb/mailer/mailer_generator.rb → ...generators/erb/mailer/mailer_generator.rb b/...generators/erb/mailer/mailer_generator.rb → ...generators/erb/mailer/mailer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/erb'
+require 'rails/generators/erb'
 
 module Erb
   module Generators

diff --git a/.../generators/erb/mailer/templates/view.erb → .../generators/erb/mailer/templates/view.erb b/.../generators/erb/mailer/templates/view.erb → .../generators/erb/mailer/templates/view.erb
diff --git a/...rators/erb/scaffold/scaffold_generator.rb → ...rators/erb/scaffold/scaffold_generator.rb b/...rators/erb/scaffold/scaffold_generator.rb → ...rators/erb/scaffold/scaffold_generator.rb
@@ -1,5 +1,5 @@
-require 'generators/erb'
+require 'rails/generators/erb'
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
 
 module Erb
   module Generators

diff --git a/...ors/erb/scaffold/templates/_form.html.erb → ...ors/erb/scaffold/templates/_form.html.erb b/...ors/erb/scaffold/templates/_form.html.erb → ...ors/erb/scaffold/templates/_form.html.erb
diff --git a/...tors/erb/scaffold/templates/edit.html.erb → ...tors/erb/scaffold/templates/edit.html.erb b/...tors/erb/scaffold/templates/edit.html.erb → ...tors/erb/scaffold/templates/edit.html.erb
diff --git a/...ors/erb/scaffold/templates/index.html.erb → ...ors/erb/scaffold/templates/index.html.erb b/...ors/erb/scaffold/templates/index.html.erb → ...ors/erb/scaffold/templates/index.html.erb
diff --git a/...rs/erb/scaffold/templates/layout.html.erb → ...rs/erb/scaffold/templates/layout.html.erb b/...rs/erb/scaffold/templates/layout.html.erb → ...rs/erb/scaffold/templates/layout.html.erb
diff --git a/...ators/erb/scaffold/templates/new.html.erb → ...ators/erb/scaffold/templates/new.html.erb b/...ators/erb/scaffold/templates/new.html.erb → ...ators/erb/scaffold/templates/new.html.erb
diff --git a/...tors/erb/scaffold/templates/show.html.erb → ...tors/erb/scaffold/templates/show.html.erb b/...tors/erb/scaffold/templates/show.html.erb → ...tors/erb/scaffold/templates/show.html.erb
diff --git a/...ies/lib/generators/generated_attribute.rb → ...b/rails/generators/generated_attribute.rb b/...ies/lib/generators/generated_attribute.rb → ...b/rails/generators/generated_attribute.rb
diff --git a/railties/lib/generators/migration.rb → railties/lib/rails/generators/migration.rb b/railties/lib/generators/migration.rb → railties/lib/rails/generators/migration.rb
diff --git a/railties/lib/generators/named_base.rb → railties/lib/rails/generators/named_base.rb b/railties/lib/generators/named_base.rb → railties/lib/rails/generators/named_base.rb
@@ -1,5 +1,5 @@
-require 'generators/base'
+require 'rails/generators/base'
-require 'generators/generated_attribute'
+require 'rails/generators/generated_attribute'
 
 module Rails
   module Generators

diff --git a/railties/lib/generators/rails/app/USAGE → ...ties/lib/rails/generators/rails/app/USAGE b/railties/lib/generators/rails/app/USAGE → ...ties/lib/rails/generators/rails/app/USAGE
diff --git a/...lib/generators/rails/app/app_generator.rb → ...ils/generators/rails/app/app_generator.rb b/...lib/generators/rails/app/app_generator.rb → ...ils/generators/rails/app/app_generator.rb
diff --git a/...lib/generators/rails/app/templates/README → ...ils/generators/rails/app/templates/README b/...lib/generators/rails/app/templates/README → ...ils/generators/rails/app/templates/README
diff --git a/...b/generators/rails/app/templates/Rakefile → ...s/generators/rails/app/templates/Rakefile b/...b/generators/rails/app/templates/Rakefile → ...s/generators/rails/app/templates/Rakefile
@@ -7,4 +7,4 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+require 'rails/tasks'
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/...mplates/app/helpers/application_helper.rb → ...mplates/app/helpers/application_helper.rb b/...mplates/app/helpers/application_helper.rb → ...mplates/app/helpers/application_helper.rb
diff --git a/...app/templates/app/models/.empty_directory → ...app/templates/app/models/.empty_directory b/...app/templates/app/models/.empty_directory → ...app/templates/app/models/.empty_directory
diff --git a/...plates/app/views/layouts/.empty_directory → ...plates/app/views/layouts/.empty_directory b/...plates/app/views/layouts/.empty_directory → ...plates/app/views/layouts/.empty_directory
diff --git a/...rators/rails/app/templates/config/boot.rb → ...rators/rails/app/templates/config/boot.rb b/...rators/rails/app/templates/config/boot.rb → ...rators/rails/app/templates/config/boot.rb
@@ -42,7 +42,11 @@ def run
 
   class VendorBoot < Boot
     def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      # activesupport/lib
+      %w(railties/lib).each do |path|
+        $:.unshift("#{RAILS_ROOT}/vendor/rails/#{path}")
+      end
+      require "rails/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
       Rails::GemDependency.add_frozen_gem_path
     end
@@ -52,7 +56,7 @@ class GemBoot < Boot
     def load_initializer
       self.class.load_rubygems
       load_rails_gem
-      require 'initializer'
+      require 'rails/initializer'
     end
 
     def load_rails_gem

diff --git a/.../templates/config/databases/frontbase.yml → .../templates/config/databases/frontbase.yml b/.../templates/config/databases/frontbase.yml → .../templates/config/databases/frontbase.yml
diff --git a/...app/templates/config/databases/ibm_db.yml → ...app/templates/config/databases/ibm_db.yml b/...app/templates/config/databases/ibm_db.yml → ...app/templates/config/databases/ibm_db.yml
diff --git a/.../app/templates/config/databases/mysql.yml → .../app/templates/config/databases/mysql.yml b/.../app/templates/config/databases/mysql.yml → .../app/templates/config/databases/mysql.yml
diff --git a/...app/templates/config/databases/oracle.yml → ...app/templates/config/databases/oracle.yml b/...app/templates/config/databases/oracle.yml → ...app/templates/config/databases/oracle.yml
diff --git a/...templates/config/databases/postgresql.yml → ...templates/config/databases/postgresql.yml b/...templates/config/databases/postgresql.yml → ...templates/config/databases/postgresql.yml
diff --git a/...pp/templates/config/databases/sqlite3.yml → ...pp/templates/config/databases/sqlite3.yml b/...pp/templates/config/databases/sqlite3.yml → ...pp/templates/config/databases/sqlite3.yml
diff --git a/...rails/app/templates/config/environment.rb → ...rails/app/templates/config/environment.rb b/...rails/app/templates/config/environment.rb → ...rails/app/templates/config/environment.rb
diff --git a/...plates/config/environments/development.rb → ...plates/config/environments/development.rb b/...plates/config/environments/development.rb → ...plates/config/environments/development.rb
diff --git a/...mplates/config/environments/production.rb → ...mplates/config/environments/production.rb b/...mplates/config/environments/production.rb → ...mplates/config/environments/production.rb
diff --git a/...app/templates/config/environments/test.rb → ...app/templates/config/environments/test.rb b/...app/templates/config/environments/test.rb → ...app/templates/config/environments/test.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...plates/config/initializers/inflections.rb → ...plates/config/initializers/inflections.rb b/...plates/config/initializers/inflections.rb → ...plates/config/initializers/inflections.rb
diff --git a/...mplates/config/initializers/mime_types.rb → ...mplates/config/initializers/mime_types.rb b/...mplates/config/initializers/mime_types.rb → ...mplates/config/initializers/mime_types.rb
diff --git a/...config/initializers/new_rails_defaults.rb → ...config/initializers/new_rails_defaults.rb b/...config/initializers/new_rails_defaults.rb → ...config/initializers/new_rails_defaults.rb
diff --git a/...s/config/initializers/session_store.rb.tt → ...s/config/initializers/session_store.rb.tt b/...s/config/initializers/session_store.rb.tt → ...s/config/initializers/session_store.rb.tt
diff --git a/...rails/app/templates/config/locales/en.yml → ...rails/app/templates/config/locales/en.yml b/...rails/app/templates/config/locales/en.yml → ...rails/app/templates/config/locales/en.yml
diff --git a/...tors/rails/app/templates/config/routes.rb → ...tors/rails/app/templates/config/routes.rb b/...tors/rails/app/templates/config/routes.rb → ...tors/rails/app/templates/config/routes.rb
diff --git a/...enerators/rails/app/templates/db/seeds.rb → ...enerators/rails/app/templates/db/seeds.rb b/...enerators/rails/app/templates/db/seeds.rb → ...enerators/rails/app/templates/db/seeds.rb
diff --git a/...rails/app/templates/dispatchers/config.ru → ...rails/app/templates/dispatchers/config.ru b/...rails/app/templates/dispatchers/config.ru → ...rails/app/templates/dispatchers/config.ru
diff --git a/...s/app/templates/dispatchers/dispatch.fcgi → ...s/app/templates/dispatchers/dispatch.fcgi b/...s/app/templates/dispatchers/dispatch.fcgi → ...s/app/templates/dispatchers/dispatch.fcgi
diff --git a/...ils/app/templates/dispatchers/dispatch.rb → ...ils/app/templates/dispatchers/dispatch.rb b/...ils/app/templates/dispatchers/dispatch.rb → ...ils/app/templates/dispatchers/dispatch.rb
diff --git a/...ils/app/templates/dispatchers/gateway.cgi → ...ils/app/templates/dispatchers/gateway.cgi b/...ils/app/templates/dispatchers/gateway.cgi → ...ils/app/templates/dispatchers/gateway.cgi
diff --git a/...rs/rails/app/templates/doc/README_FOR_APP → ...rs/rails/app/templates/doc/README_FOR_APP b/...rs/rails/app/templates/doc/README_FOR_APP → ...rs/rails/app/templates/doc/README_FOR_APP
diff --git a/...ators/rails/app/templates/public/404.html → ...ators/rails/app/templates/public/404.html b/...ators/rails/app/templates/public/404.html → ...ators/rails/app/templates/public/404.html
diff --git a/...ators/rails/app/templates/public/422.html → ...ators/rails/app/templates/public/422.html b/...ators/rails/app/templates/public/422.html → ...ators/rails/app/templates/public/422.html
diff --git a/...ators/rails/app/templates/public/500.html → ...ators/rails/app/templates/public/500.html b/...ators/rails/app/templates/public/500.html → ...ators/rails/app/templates/public/500.html
diff --git a/...rs/rails/app/templates/public/favicon.ico → ...rs/rails/app/templates/public/favicon.ico b/...rs/rails/app/templates/public/favicon.ico → ...rs/rails/app/templates/public/favicon.ico
diff --git a/...ils/app/templates/public/images/rails.png → ...ils/app/templates/public/images/rails.png b/...ils/app/templates/public/images/rails.png → ...ils/app/templates/public/images/rails.png
diff --git a/...ors/rails/app/templates/public/index.html → ...ors/rails/app/templates/public/index.html b/...ors/rails/app/templates/public/index.html → ...ors/rails/app/templates/public/index.html
diff --git a/...mplates/public/javascripts/application.js → ...mplates/public/javascripts/application.js b/...mplates/public/javascripts/application.js → ...mplates/public/javascripts/application.js
diff --git a/.../templates/public/javascripts/controls.js → .../templates/public/javascripts/controls.js b/.../templates/public/javascripts/controls.js → .../templates/public/javascripts/controls.js
diff --git a/.../templates/public/javascripts/dragdrop.js → .../templates/public/javascripts/dragdrop.js b/.../templates/public/javascripts/dragdrop.js → .../templates/public/javascripts/dragdrop.js
diff --git a/...p/templates/public/javascripts/effects.js → ...p/templates/public/javascripts/effects.js b/...p/templates/public/javascripts/effects.js → ...p/templates/public/javascripts/effects.js
diff --git a/...templates/public/javascripts/prototype.js → ...templates/public/javascripts/prototype.js b/...templates/public/javascripts/prototype.js → ...templates/public/javascripts/prototype.js
diff --git a/...ors/rails/app/templates/public/robots.txt → ...ors/rails/app/templates/public/robots.txt b/...ors/rails/app/templates/public/robots.txt → ...ors/rails/app/templates/public/robots.txt
diff --git a/...lates/public/stylesheets/.empty_directory → ...lates/public/stylesheets/.empty_directory b/...lates/public/stylesheets/.empty_directory → ...lates/public/stylesheets/.empty_directory
diff --git a/...ators/rails/app/templates/script/about.tt → ...ators/rails/app/templates/script/about.tt b/...ators/rails/app/templates/script/about.tt → ...ators/rails/app/templates/script/about.tt
@@ -1,4 +1,4 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
+require 'rails/commands/about'
diff --git a/...ors/rails/app/templates/script/console.tt → ...ors/rails/app/templates/script/console.tt b/...ors/rails/app/templates/script/console.tt → ...ors/rails/app/templates/script/console.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/console'
+require 'rails/commands/console'
diff --git a/...s/rails/app/templates/script/dbconsole.tt → ...s/rails/app/templates/script/dbconsole.tt b/...s/rails/app/templates/script/dbconsole.tt → ...s/rails/app/templates/script/dbconsole.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/dbconsole'
+require 'rails/commands/dbconsole'
diff --git a/...ors/rails/app/templates/script/destroy.tt → ...ors/rails/app/templates/script/destroy.tt b/...ors/rails/app/templates/script/destroy.tt → ...ors/rails/app/templates/script/destroy.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/destroy'
+require 'rails/commands/destroy'
diff --git a/...rs/rails/app/templates/script/generate.tt → ...rs/rails/app/templates/script/generate.tt b/...rs/rails/app/templates/script/generate.tt → ...rs/rails/app/templates/script/generate.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/generate'
+require 'rails/commands/generate'
diff --git a/...mplates/script/performance/benchmarker.tt → ...mplates/script/performance/benchmarker.tt b/...mplates/script/performance/benchmarker.tt → ...mplates/script/performance/benchmarker.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../../config/boot',  __FILE__)
-require 'commands/performance/benchmarker'
+require 'rails/commands/performance/benchmarker'
diff --git a/.../templates/script/performance/profiler.tt → .../templates/script/performance/profiler.tt b/.../templates/script/performance/profiler.tt → .../templates/script/performance/profiler.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../../config/boot',  __FILE__)
-require 'commands/performance/profiler'
+require 'rails/commands/performance/profiler'
diff --git a/...tors/rails/app/templates/script/plugin.tt → ...tors/rails/app/templates/script/plugin.tt b/...tors/rails/app/templates/script/plugin.tt → ...tors/rails/app/templates/script/plugin.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/plugin'
+require 'rails/commands/plugin'
diff --git a/...tors/rails/app/templates/script/runner.tt → ...tors/rails/app/templates/script/runner.tt b/...tors/rails/app/templates/script/runner.tt → ...tors/rails/app/templates/script/runner.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/runner'
+require 'rails/commands/runner'
diff --git a/...tors/rails/app/templates/script/server.tt → ...tors/rails/app/templates/script/server.tt b/...tors/rails/app/templates/script/server.tt → ...tors/rails/app/templates/script/server.tt
@@ -1,3 +1,3 @@
 <%= shebang %>
 require File.expand_path('../../config/boot',  __FILE__)
-require 'commands/server'
+require 'rails/commands/server'
diff --git a/.../templates/test/fixtures/.empty_directory → .../templates/test/fixtures/.empty_directory b/.../templates/test/fixtures/.empty_directory → .../templates/test/fixtures/.empty_directory
diff --git a/...emplates/test/functional/.empty_directory → ...emplates/test/functional/.empty_directory b/...emplates/test/functional/.empty_directory → ...emplates/test/functional/.empty_directory
diff --git a/...mplates/test/integration/.empty_directory → ...mplates/test/integration/.empty_directory b/...mplates/test/integration/.empty_directory → ...mplates/test/integration/.empty_directory
diff --git a/...mplates/test/performance/browsing_test.rb → ...mplates/test/performance/browsing_test.rb b/...mplates/test/performance/browsing_test.rb → ...mplates/test/performance/browsing_test.rb
diff --git a/...s/rails/app/templates/test/test_helper.rb → ...s/rails/app/templates/test/test_helper.rb b/...s/rails/app/templates/test/test_helper.rb → ...s/rails/app/templates/test/test_helper.rb
@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require 'rails/test_help'
 
 class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method

diff --git a/.../app/templates/test/unit/.empty_directory → .../app/templates/test/unit/.empty_directory b/.../app/templates/test/unit/.empty_directory → .../app/templates/test/unit/.empty_directory
diff --git a/...ies/lib/generators/rails/controller/USAGE → ...b/rails/generators/rails/controller/USAGE b/...ies/lib/generators/rails/controller/USAGE → ...b/rails/generators/rails/controller/USAGE
diff --git a/.../rails/controller/controller_generator.rb → .../rails/controller/controller_generator.rb b/.../rails/controller/controller_generator.rb → .../rails/controller/controller_generator.rb
diff --git a/.../rails/controller/templates/controller.rb → .../rails/controller/templates/controller.rb b/.../rails/controller/templates/controller.rb → .../rails/controller/templates/controller.rb
diff --git a/...ties/lib/generators/rails/generator/USAGE → ...ib/rails/generators/rails/generator/USAGE b/...ties/lib/generators/rails/generator/USAGE → ...ib/rails/generators/rails/generator/USAGE
diff --git a/...rs/rails/generator/generator_generator.rb → ...rs/rails/generator/generator_generator.rb b/...rs/rails/generator/generator_generator.rb → ...rs/rails/generator/generator_generator.rb
diff --git a/...tor/templates/%file_name%_generator.rb.tt → ...tor/templates/%file_name%_generator.rb.tt b/...tor/templates/%file_name%_generator.rb.tt → ...tor/templates/%file_name%_generator.rb.tt
diff --git a/...rators/rails/generator/templates/USAGE.tt → ...rators/rails/generator/templates/USAGE.tt b/...rators/rails/generator/templates/USAGE.tt → ...rators/rails/generator/templates/USAGE.tt
diff --git a/...ator/templates/templates/.empty_directory → ...ator/templates/templates/.empty_directory b/...ator/templates/templates/.empty_directory → ...ator/templates/templates/.empty_directory
diff --git a/railties/lib/generators/rails/helper/USAGE → ...s/lib/rails/generators/rails/helper/USAGE b/railties/lib/generators/rails/helper/USAGE → ...s/lib/rails/generators/rails/helper/USAGE
diff --git a/...nerators/rails/helper/helper_generator.rb → ...nerators/rails/helper/helper_generator.rb b/...nerators/rails/helper/helper_generator.rb → ...nerators/rails/helper/helper_generator.rb
diff --git a/...nerators/rails/helper/templates/helper.rb → ...nerators/rails/helper/templates/helper.rb b/...nerators/rails/helper/templates/helper.rb → ...nerators/rails/helper/templates/helper.rb
diff --git a/...b/generators/rails/integration_test/USAGE → ...s/generators/rails/integration_test/USAGE b/...b/generators/rails/integration_test/USAGE → ...s/generators/rails/integration_test/USAGE
diff --git a/...ration_test/integration_test_generator.rb → ...ration_test/integration_test_generator.rb b/...ration_test/integration_test_generator.rb → ...ration_test/integration_test_generator.rb
diff --git a/railties/lib/generators/rails/mailer/USAGE → ...s/lib/rails/generators/rails/mailer/USAGE b/railties/lib/generators/rails/mailer/USAGE → ...s/lib/rails/generators/rails/mailer/USAGE
diff --git a/...nerators/rails/mailer/mailer_generator.rb → ...nerators/rails/mailer/mailer_generator.rb b/...nerators/rails/mailer/mailer_generator.rb → ...nerators/rails/mailer/mailer_generator.rb
diff --git a/...nerators/rails/mailer/templates/mailer.rb → ...nerators/rails/mailer/templates/mailer.rb b/...nerators/rails/mailer/templates/mailer.rb → ...nerators/rails/mailer/templates/mailer.rb
diff --git a/railties/lib/generators/rails/metal/USAGE → ...es/lib/rails/generators/rails/metal/USAGE b/railties/lib/generators/rails/metal/USAGE → ...es/lib/rails/generators/rails/metal/USAGE
diff --git a/...generators/rails/metal/metal_generator.rb → ...generators/rails/metal/metal_generator.rb b/...generators/rails/metal/metal_generator.rb → ...generators/rails/metal/metal_generator.rb
diff --git a/...generators/rails/metal/templates/metal.rb → ...generators/rails/metal/templates/metal.rb b/...generators/rails/metal/templates/metal.rb → ...generators/rails/metal/templates/metal.rb
diff --git a/...ties/lib/generators/rails/migration/USAGE → ...ib/rails/generators/rails/migration/USAGE b/...ties/lib/generators/rails/migration/USAGE → ...ib/rails/generators/rails/migration/USAGE
diff --git a/...rs/rails/migration/migration_generator.rb → ...rs/rails/migration/migration_generator.rb b/...rs/rails/migration/migration_generator.rb → ...rs/rails/migration/migration_generator.rb
diff --git a/railties/lib/generators/rails/model/USAGE → ...es/lib/rails/generators/rails/model/USAGE b/railties/lib/generators/rails/model/USAGE → ...es/lib/rails/generators/rails/model/USAGE
diff --git a/...generators/rails/model/model_generator.rb → ...generators/rails/model/model_generator.rb b/...generators/rails/model/model_generator.rb → ...generators/rails/model/model_generator.rb
diff --git a/...odel_subclass/model_subclass_generator.rb → ...odel_subclass/model_subclass_generator.rb b/...odel_subclass/model_subclass_generator.rb → ...odel_subclass/model_subclass_generator.rb
diff --git a/railties/lib/generators/rails/observer/USAGE → ...lib/rails/generators/rails/observer/USAGE b/railties/lib/generators/rails/observer/USAGE → ...lib/rails/generators/rails/observer/USAGE
diff --git a/...tors/rails/observer/observer_generator.rb → ...tors/rails/observer/observer_generator.rb b/...tors/rails/observer/observer_generator.rb → ...tors/rails/observer/observer_generator.rb
diff --git a/...b/generators/rails/performance_test/USAGE → ...s/generators/rails/performance_test/USAGE b/...b/generators/rails/performance_test/USAGE → ...s/generators/rails/performance_test/USAGE
diff --git a/...rmance_test/performance_test_generator.rb → ...rmance_test/performance_test_generator.rb b/...rmance_test/performance_test_generator.rb → ...rmance_test/performance_test_generator.rb
diff --git a/railties/lib/generators/rails/plugin/USAGE → ...s/lib/rails/generators/rails/plugin/USAGE b/railties/lib/generators/rails/plugin/USAGE → ...s/lib/rails/generators/rails/plugin/USAGE
diff --git a/...nerators/rails/plugin/plugin_generator.rb → ...nerators/rails/plugin/plugin_generator.rb b/...nerators/rails/plugin/plugin_generator.rb → ...nerators/rails/plugin/plugin_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/rails/generator/generator_generator'
+require 'rails/generators/rails/generator/generator_generator'
 
 module Rails
   module Generators

diff --git a/...rators/rails/plugin/templates/MIT-LICENSE → ...rators/rails/plugin/templates/MIT-LICENSE b/...rators/rails/plugin/templates/MIT-LICENSE → ...rators/rails/plugin/templates/MIT-LICENSE
diff --git a/.../generators/rails/plugin/templates/README → .../generators/rails/plugin/templates/README b/.../generators/rails/plugin/templates/README → .../generators/rails/plugin/templates/README
diff --git a/...enerators/rails/plugin/templates/Rakefile → ...enerators/rails/plugin/templates/Rakefile b/...enerators/rails/plugin/templates/Rakefile → ...enerators/rails/plugin/templates/Rakefile
diff --git a/...generators/rails/plugin/templates/init.rb → ...generators/rails/plugin/templates/init.rb b/...generators/rails/plugin/templates/init.rb → ...generators/rails/plugin/templates/init.rb
diff --git a/...erators/rails/plugin/templates/install.rb → ...erators/rails/plugin/templates/install.rb b/...erators/rails/plugin/templates/install.rb → ...erators/rails/plugin/templates/install.rb
diff --git a/...ls/plugin/templates/lib/%file_name%.rb.tt → ...ls/plugin/templates/lib/%file_name%.rb.tt b/...ls/plugin/templates/lib/%file_name%.rb.tt → ...ls/plugin/templates/lib/%file_name%.rb.tt
diff --git a/...templates/tasks/%file_name%_tasks.rake.tt → ...templates/tasks/%file_name%_tasks.rake.tt b/...templates/tasks/%file_name%_tasks.rake.tt → ...templates/tasks/%file_name%_tasks.rake.tt
diff --git a/...ators/rails/plugin/templates/uninstall.rb → ...ators/rails/plugin/templates/uninstall.rb b/...ators/rails/plugin/templates/uninstall.rb → ...ators/rails/plugin/templates/uninstall.rb
diff --git a/railties/lib/generators/rails/resource/USAGE → ...lib/rails/generators/rails/resource/USAGE b/railties/lib/generators/rails/resource/USAGE → ...lib/rails/generators/rails/resource/USAGE
diff --git a/...tors/rails/resource/resource_generator.rb → ...tors/rails/resource/resource_generator.rb b/...tors/rails/resource/resource_generator.rb → ...tors/rails/resource/resource_generator.rb
@@ -1,5 +1,5 @@
-require 'generators/rails/model/model_generator'
+require 'rails/generators/rails/model/model_generator'
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
 
 module Rails
   module Generators

diff --git a/railties/lib/generators/rails/scaffold/USAGE → ...lib/rails/generators/rails/scaffold/USAGE b/railties/lib/generators/rails/scaffold/USAGE → ...lib/rails/generators/rails/scaffold/USAGE
diff --git a/...tors/rails/scaffold/scaffold_generator.rb → ...tors/rails/scaffold/scaffold_generator.rb b/...tors/rails/scaffold/scaffold_generator.rb → ...tors/rails/scaffold/scaffold_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/rails/resource/resource_generator'
+require 'rails/generators/rails/resource/resource_generator'
 
 module Rails
   module Generators

diff --git a/...enerators/rails/scaffold_controller/USAGE → ...enerators/rails/scaffold_controller/USAGE b/...enerators/rails/scaffold_controller/USAGE → ...enerators/rails/scaffold_controller/USAGE
diff --git a/...ntroller/scaffold_controller_generator.rb → ...ntroller/scaffold_controller_generator.rb b/...ntroller/scaffold_controller_generator.rb → ...ntroller/scaffold_controller_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
 
 module Rails
   module Generators

diff --git a/...affold_controller/templates/controller.rb → ...affold_controller/templates/controller.rb b/...affold_controller/templates/controller.rb → ...affold_controller/templates/controller.rb
diff --git a/.../generators/rails/session_migration/USAGE → .../generators/rails/session_migration/USAGE b/.../generators/rails/session_migration/USAGE → .../generators/rails/session_migration/USAGE
diff --git a/..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb b/..._migration/session_migration_generator.rb → ..._migration/session_migration_generator.rb
diff --git a/...es/lib/generators/rails/stylesheets/USAGE → .../rails/generators/rails/stylesheets/USAGE b/...es/lib/generators/rails/stylesheets/USAGE → .../rails/generators/rails/stylesheets/USAGE
diff --git a/...ails/stylesheets/stylesheets_generator.rb → ...ails/stylesheets/stylesheets_generator.rb b/...ails/stylesheets/stylesheets_generator.rb → ...ails/stylesheets/stylesheets_generator.rb
diff --git a/.../rails/stylesheets/templates/scaffold.css → .../rails/stylesheets/templates/scaffold.css b/.../rails/stylesheets/templates/scaffold.css → .../rails/stylesheets/templates/scaffold.css
diff --git a/railties/lib/generators/resource_helpers.rb → .../lib/rails/generators/resource_helpers.rb b/railties/lib/generators/resource_helpers.rb → .../lib/rails/generators/resource_helpers.rb
@@ -54,7 +54,7 @@ def orm_class
             begin
               klass = active_model.constantize
             rescue NameError
-              require "generators/#{options[:orm]}"
+              require "rails/generators/#{options[:orm]}"
             end
 
             # Try once again after loading the file with success.

diff --git a/railties/lib/generators/test_unit.rb → railties/lib/rails/generators/test_unit.rb b/railties/lib/generators/test_unit.rb → railties/lib/rails/generators/test_unit.rb
@@ -1,4 +1,4 @@
-require 'generators/named_base'
+require 'rails/generators/named_base'
 
 module TestUnit
   module Generators

diff --git a/...t_unit/controller/controller_generator.rb → ...t_unit/controller/controller_generator.rb b/...t_unit/controller/controller_generator.rb → ...t_unit/controller/controller_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...t/controller/templates/functional_test.rb → ...t/controller/templates/functional_test.rb b/...t/controller/templates/functional_test.rb → ...t/controller/templates/functional_test.rb
diff --git a/...tors/test_unit/helper/helper_generator.rb → ...tors/test_unit/helper/helper_generator.rb b/...tors/test_unit/helper/helper_generator.rb → ...tors/test_unit/helper/helper_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...test_unit/helper/templates/helper_test.rb → ...test_unit/helper/templates/helper_test.rb b/...test_unit/helper/templates/helper_test.rb → ...test_unit/helper/templates/helper_test.rb
diff --git a/...unit/integration/integration_generator.rb → ...unit/integration/integration_generator.rb b/...unit/integration/integration_generator.rb → ...unit/integration/integration_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...integration/templates/integration_test.rb → ...integration/templates/integration_test.rb b/...integration/templates/integration_test.rb → ...integration/templates/integration_test.rb
diff --git a/...tors/test_unit/mailer/mailer_generator.rb → ...tors/test_unit/mailer/mailer_generator.rb b/...tors/test_unit/mailer/mailer_generator.rb → ...tors/test_unit/mailer/mailer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...rators/test_unit/mailer/templates/fixture → ...rators/test_unit/mailer/templates/fixture b/...rators/test_unit/mailer/templates/fixture → ...rators/test_unit/mailer/templates/fixture
diff --git a/...s/test_unit/mailer/templates/unit_test.rb → ...s/test_unit/mailer/templates/unit_test.rb b/...s/test_unit/mailer/templates/unit_test.rb → ...s/test_unit/mailer/templates/unit_test.rb
diff --git a/...rators/test_unit/model/model_generator.rb → ...rators/test_unit/model/model_generator.rb b/...rators/test_unit/model/model_generator.rb → ...rators/test_unit/model/model_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...rs/test_unit/model/templates/fixtures.yml → ...rs/test_unit/model/templates/fixtures.yml b/...rs/test_unit/model/templates/fixtures.yml → ...rs/test_unit/model/templates/fixtures.yml
diff --git a/...rs/test_unit/model/templates/unit_test.rb → ...rs/test_unit/model/templates/unit_test.rb b/...rs/test_unit/model/templates/unit_test.rb → ...rs/test_unit/model/templates/unit_test.rb
diff --git a/.../test_unit/observer/observer_generator.rb → .../test_unit/observer/observer_generator.rb b/.../test_unit/observer/observer_generator.rb → .../test_unit/observer/observer_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...test_unit/observer/templates/unit_test.rb → ...test_unit/observer/templates/unit_test.rb b/...test_unit/observer/templates/unit_test.rb → ...test_unit/observer/templates/unit_test.rb
diff --git a/...unit/performance/performance_generator.rb → ...unit/performance/performance_generator.rb b/...unit/performance/performance_generator.rb → ...unit/performance/performance_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...performance/templates/performance_test.rb → ...performance/templates/performance_test.rb b/...performance/templates/performance_test.rb → ...performance/templates/performance_test.rb
diff --git a/...tors/test_unit/plugin/plugin_generator.rb → ...tors/test_unit/plugin/plugin_generator.rb b/...tors/test_unit/plugin/plugin_generator.rb → ...tors/test_unit/plugin/plugin_generator.rb
@@ -1,4 +1,4 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
 
 module TestUnit
   module Generators

diff --git a/...t/plugin/templates/%file_name%_test.rb.tt → ...t/plugin/templates/%file_name%_test.rb.tt b/...t/plugin/templates/%file_name%_test.rb.tt → ...t/plugin/templates/%file_name%_test.rb.tt
diff --git a/...test_unit/plugin/templates/test_helper.rb → ...test_unit/plugin/templates/test_helper.rb b/...test_unit/plugin/templates/test_helper.rb → ...test_unit/plugin/templates/test_helper.rb
diff --git a/.../test_unit/scaffold/scaffold_generator.rb → .../test_unit/scaffold/scaffold_generator.rb b/.../test_unit/scaffold/scaffold_generator.rb → .../test_unit/scaffold/scaffold_generator.rb
@@ -1,5 +1,5 @@
-require 'generators/test_unit'
+require 'rails/generators/test_unit'
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
 
 module TestUnit
   module Generators

diff --git a/...nit/scaffold/templates/functional_test.rb → ...nit/scaffold/templates/functional_test.rb b/...nit/scaffold/templates/functional_test.rb → ...nit/scaffold/templates/functional_test.rb
diff --git a/railties/lib/initializer.rb → railties/lib/rails/initializer.rb b/railties/lib/initializer.rb → railties/lib/rails/initializer.rb
@@ -1,7 +1,6 @@
 require "pathname"
 
-$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'rails/railties_path'
-require 'railties_path'
 require 'rails/version'
 require 'rails/gem_dependency'
 require 'rails/rack'
@@ -114,7 +113,7 @@ def self.run(initializer = nil, config = nil)
   # Check for valid Ruby version (1.8.2 or 1.8.4 or higher). This is done in an
   # external file, so we can use it from the `rails` program as well without duplication.
   Initializer.default.add :check_ruby_version do
-    require 'ruby_version_check'
+    require 'rails/ruby_version_check'
   end
 
   # If Rails is vendored and RubyGems is available, install stub GemSpecs
@@ -523,7 +522,7 @@ def self.run(initializer = nil, config = nil)
   # # Prepare dispatcher callbacks and run 'prepare' callbacks
   Initializer.default.add :prepare_dispatcher do
     next unless configuration.frameworks.include?(:action_controller)
-    require 'dispatcher' unless defined?(::Dispatcher)
+    require 'rails/dispatcher' unless defined?(::Dispatcher)
     Dispatcher.define_dispatcher_callbacks(configuration.cache_classes)
   end
 

diff --git a/railties/lib/initializer_old.rb → railties/lib/rails/initializer_old.rb b/railties/lib/initializer_old.rb → railties/lib/rails/initializer_old.rb
diff --git a/railties/lib/performance_test_help.rb → railties/lib/rails/performance_test_help.rb b/railties/lib/performance_test_help.rb → railties/lib/rails/performance_test_help.rb
diff --git a/railties/lib/railties_path.rb → railties/lib/rails/railties_path.rb b/railties/lib/railties_path.rb → railties/lib/rails/railties_path.rb
@@ -1 +1 @@
-RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
diff --git a/railties/lib/ruby_version_check.rb → railties/lib/rails/ruby_version_check.rb b/railties/lib/ruby_version_check.rb → railties/lib/rails/ruby_version_check.rb
diff --git a/railties/lib/rubyprof_ext.rb → railties/lib/rails/rubyprof_ext.rb b/railties/lib/rubyprof_ext.rb → railties/lib/rails/rubyprof_ext.rb
diff --git a/railties/lib/source_annotation_extractor.rb → .../lib/rails/source_annotation_extractor.rb b/railties/lib/source_annotation_extractor.rb → .../lib/rails/source_annotation_extractor.rb