diff --git a/rails2/Gemfile b/rails/rails2/Gemfile
similarity index 100%
rename from rails2/Gemfile
rename to rails/rails2/Gemfile
diff --git a/rails2/Gemfile.lock b/rails/rails2/Gemfile.lock
similarity index 100%
rename from rails2/Gemfile.lock
rename to rails/rails2/Gemfile.lock
diff --git a/rails2/pennmaps/.gitignore b/rails/rails2/pennmaps/.gitignore
similarity index 100%
rename from rails2/pennmaps/.gitignore
rename to rails/rails2/pennmaps/.gitignore
diff --git a/rails2/pennmaps/README b/rails/rails2/pennmaps/README
similarity index 100%
rename from rails2/pennmaps/README
rename to rails/rails2/pennmaps/README
diff --git a/rails2/pennmaps/Rakefile b/rails/rails2/pennmaps/Rakefile
similarity index 100%
rename from rails2/pennmaps/Rakefile
rename to rails/rails2/pennmaps/Rakefile
diff --git a/rails2/pennmaps/app/controllers/application_controller.rb b/rails/rails2/pennmaps/app/controllers/application_controller.rb
similarity index 100%
rename from rails2/pennmaps/app/controllers/application_controller.rb
rename to rails/rails2/pennmaps/app/controllers/application_controller.rb
diff --git a/rails2/pennmaps/app/helpers/application_helper.rb b/rails/rails2/pennmaps/app/helpers/application_helper.rb
similarity index 100%
rename from rails2/pennmaps/app/helpers/application_helper.rb
rename to rails/rails2/pennmaps/app/helpers/application_helper.rb
diff --git a/rails2/pennmaps/config/boot.rb b/rails/rails2/pennmaps/config/boot.rb
similarity index 100%
rename from rails2/pennmaps/config/boot.rb
rename to rails/rails2/pennmaps/config/boot.rb
diff --git a/rails2/pennmaps/config/database.yml b/rails/rails2/pennmaps/config/database.yml
similarity index 100%
rename from rails2/pennmaps/config/database.yml
rename to rails/rails2/pennmaps/config/database.yml
diff --git a/rails2/pennmaps/config/environment.rb b/rails/rails2/pennmaps/config/environment.rb
similarity index 100%
rename from rails2/pennmaps/config/environment.rb
rename to rails/rails2/pennmaps/config/environment.rb
diff --git a/rails2/pennmaps/config/environments/development.rb b/rails/rails2/pennmaps/config/environments/development.rb
similarity index 100%
rename from rails2/pennmaps/config/environments/development.rb
rename to rails/rails2/pennmaps/config/environments/development.rb
diff --git a/rails2/pennmaps/config/environments/production.rb b/rails/rails2/pennmaps/config/environments/production.rb
similarity index 100%
rename from rails2/pennmaps/config/environments/production.rb
rename to rails/rails2/pennmaps/config/environments/production.rb
diff --git a/rails2/pennmaps/config/environments/test.rb b/rails/rails2/pennmaps/config/environments/test.rb
similarity index 100%
rename from rails2/pennmaps/config/environments/test.rb
rename to rails/rails2/pennmaps/config/environments/test.rb
diff --git a/rails2/pennmaps/config/initializers/backtrace_silencers.rb b/rails/rails2/pennmaps/config/initializers/backtrace_silencers.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/backtrace_silencers.rb
rename to rails/rails2/pennmaps/config/initializers/backtrace_silencers.rb
diff --git a/rails2/pennmaps/config/initializers/cookie_verification_secret.rb b/rails/rails2/pennmaps/config/initializers/cookie_verification_secret.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/cookie_verification_secret.rb
rename to rails/rails2/pennmaps/config/initializers/cookie_verification_secret.rb
diff --git a/rails2/pennmaps/config/initializers/inflections.rb b/rails/rails2/pennmaps/config/initializers/inflections.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/inflections.rb
rename to rails/rails2/pennmaps/config/initializers/inflections.rb
diff --git a/rails2/pennmaps/config/initializers/mime_types.rb b/rails/rails2/pennmaps/config/initializers/mime_types.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/mime_types.rb
rename to rails/rails2/pennmaps/config/initializers/mime_types.rb
diff --git a/rails2/pennmaps/config/initializers/new_rails_defaults.rb b/rails/rails2/pennmaps/config/initializers/new_rails_defaults.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/new_rails_defaults.rb
rename to rails/rails2/pennmaps/config/initializers/new_rails_defaults.rb
diff --git a/rails2/pennmaps/config/initializers/session_store.rb b/rails/rails2/pennmaps/config/initializers/session_store.rb
similarity index 100%
rename from rails2/pennmaps/config/initializers/session_store.rb
rename to rails/rails2/pennmaps/config/initializers/session_store.rb
diff --git a/rails2/pennmaps/config/locales/en.yml b/rails/rails2/pennmaps/config/locales/en.yml
similarity index 100%
rename from rails2/pennmaps/config/locales/en.yml
rename to rails/rails2/pennmaps/config/locales/en.yml
diff --git a/rails2/pennmaps/config/routes.rb b/rails/rails2/pennmaps/config/routes.rb
similarity index 100%
rename from rails2/pennmaps/config/routes.rb
rename to rails/rails2/pennmaps/config/routes.rb
diff --git a/rails2/pennmaps/db/seeds.rb b/rails/rails2/pennmaps/db/seeds.rb
similarity index 100%
rename from rails2/pennmaps/db/seeds.rb
rename to rails/rails2/pennmaps/db/seeds.rb
diff --git a/rails2/pennmaps/doc/README_FOR_APP b/rails/rails2/pennmaps/doc/README_FOR_APP
similarity index 100%
rename from rails2/pennmaps/doc/README_FOR_APP
rename to rails/rails2/pennmaps/doc/README_FOR_APP
diff --git a/rails2/pennmaps/public/404.html b/rails/rails2/pennmaps/public/404.html
similarity index 100%
rename from rails2/pennmaps/public/404.html
rename to rails/rails2/pennmaps/public/404.html
diff --git a/rails2/pennmaps/public/422.html b/rails/rails2/pennmaps/public/422.html
similarity index 100%
rename from rails2/pennmaps/public/422.html
rename to rails/rails2/pennmaps/public/422.html
diff --git a/rails2/pennmaps/public/500.html b/rails/rails2/pennmaps/public/500.html
similarity index 100%
rename from rails2/pennmaps/public/500.html
rename to rails/rails2/pennmaps/public/500.html
diff --git a/rails2/pennmaps/public/favicon.ico b/rails/rails2/pennmaps/public/favicon.ico
similarity index 100%
rename from rails2/pennmaps/public/favicon.ico
rename to rails/rails2/pennmaps/public/favicon.ico
diff --git a/rails2/pennmaps/public/images/rails.png b/rails/rails2/pennmaps/public/images/rails.png
similarity index 100%
rename from rails2/pennmaps/public/images/rails.png
rename to rails/rails2/pennmaps/public/images/rails.png
diff --git a/rails2/pennmaps/public/index.html b/rails/rails2/pennmaps/public/index.html
similarity index 100%
rename from rails2/pennmaps/public/index.html
rename to rails/rails2/pennmaps/public/index.html
diff --git a/rails2/pennmaps/public/javascripts/application.js b/rails/rails2/pennmaps/public/javascripts/application.js
similarity index 100%
rename from rails2/pennmaps/public/javascripts/application.js
rename to rails/rails2/pennmaps/public/javascripts/application.js
diff --git a/rails2/pennmaps/public/javascripts/controls.js b/rails/rails2/pennmaps/public/javascripts/controls.js
similarity index 100%
rename from rails2/pennmaps/public/javascripts/controls.js
rename to rails/rails2/pennmaps/public/javascripts/controls.js
diff --git a/rails2/pennmaps/public/javascripts/dragdrop.js b/rails/rails2/pennmaps/public/javascripts/dragdrop.js
similarity index 100%
rename from rails2/pennmaps/public/javascripts/dragdrop.js
rename to rails/rails2/pennmaps/public/javascripts/dragdrop.js
diff --git a/rails2/pennmaps/public/javascripts/effects.js b/rails/rails2/pennmaps/public/javascripts/effects.js
similarity index 100%
rename from rails2/pennmaps/public/javascripts/effects.js
rename to rails/rails2/pennmaps/public/javascripts/effects.js
diff --git a/rails2/pennmaps/public/javascripts/prototype.js b/rails/rails2/pennmaps/public/javascripts/prototype.js
similarity index 100%
rename from rails2/pennmaps/public/javascripts/prototype.js
rename to rails/rails2/pennmaps/public/javascripts/prototype.js
diff --git a/rails2/pennmaps/public/robots.txt b/rails/rails2/pennmaps/public/robots.txt
similarity index 100%
rename from rails2/pennmaps/public/robots.txt
rename to rails/rails2/pennmaps/public/robots.txt
diff --git a/rails2/pennmaps/script/about b/rails/rails2/pennmaps/script/about
similarity index 100%
rename from rails2/pennmaps/script/about
rename to rails/rails2/pennmaps/script/about
diff --git a/rails2/pennmaps/script/console b/rails/rails2/pennmaps/script/console
similarity index 100%
rename from rails2/pennmaps/script/console
rename to rails/rails2/pennmaps/script/console
diff --git a/rails2/pennmaps/script/dbconsole b/rails/rails2/pennmaps/script/dbconsole
similarity index 100%
rename from rails2/pennmaps/script/dbconsole
rename to rails/rails2/pennmaps/script/dbconsole
diff --git a/rails2/pennmaps/script/destroy b/rails/rails2/pennmaps/script/destroy
similarity index 100%
rename from rails2/pennmaps/script/destroy
rename to rails/rails2/pennmaps/script/destroy
diff --git a/rails2/pennmaps/script/generate b/rails/rails2/pennmaps/script/generate
similarity index 100%
rename from rails2/pennmaps/script/generate
rename to rails/rails2/pennmaps/script/generate
diff --git a/rails2/pennmaps/script/performance/benchmarker b/rails/rails2/pennmaps/script/performance/benchmarker
similarity index 100%
rename from rails2/pennmaps/script/performance/benchmarker
rename to rails/rails2/pennmaps/script/performance/benchmarker
diff --git a/rails2/pennmaps/script/performance/profiler b/rails/rails2/pennmaps/script/performance/profiler
similarity index 100%
rename from rails2/pennmaps/script/performance/profiler
rename to rails/rails2/pennmaps/script/performance/profiler
diff --git a/rails2/pennmaps/script/plugin b/rails/rails2/pennmaps/script/plugin
similarity index 100%
rename from rails2/pennmaps/script/plugin
rename to rails/rails2/pennmaps/script/plugin
diff --git a/rails2/pennmaps/script/runner b/rails/rails2/pennmaps/script/runner
similarity index 100%
rename from rails2/pennmaps/script/runner
rename to rails/rails2/pennmaps/script/runner
diff --git a/rails2/pennmaps/script/server b/rails/rails2/pennmaps/script/server
similarity index 100%
rename from rails2/pennmaps/script/server
rename to rails/rails2/pennmaps/script/server
diff --git a/rails2/pennmaps/test/performance/browsing_test.rb b/rails/rails2/pennmaps/test/performance/browsing_test.rb
similarity index 100%
rename from rails2/pennmaps/test/performance/browsing_test.rb
rename to rails/rails2/pennmaps/test/performance/browsing_test.rb
diff --git a/rails2/pennmaps/test/test_helper.rb b/rails/rails2/pennmaps/test/test_helper.rb
similarity index 100%
rename from rails2/pennmaps/test/test_helper.rb
rename to rails/rails2/pennmaps/test/test_helper.rb