diff --git a/rails/map-mash/.gitignore b/map-mash/.gitignore
similarity index 100%
rename from rails/map-mash/.gitignore
rename to map-mash/.gitignore
diff --git a/rails/map-mash/Gemfile b/map-mash/Gemfile
similarity index 100%
rename from rails/map-mash/Gemfile
rename to map-mash/Gemfile
diff --git a/rails/map-mash/Gemfile.lock b/map-mash/Gemfile.lock
similarity index 100%
rename from rails/map-mash/Gemfile.lock
rename to map-mash/Gemfile.lock
diff --git a/rails/map-mash/Procfile b/map-mash/Procfile
similarity index 100%
rename from rails/map-mash/Procfile
rename to map-mash/Procfile
diff --git a/rails/map-mash/README.md b/map-mash/README.md
similarity index 100%
rename from rails/map-mash/README.md
rename to map-mash/README.md
diff --git a/rails/map-mash/Rakefile b/map-mash/Rakefile
similarity index 100%
rename from rails/map-mash/Rakefile
rename to map-mash/Rakefile
diff --git a/rails/map-mash/app/controllers/application_controller.rb b/map-mash/app/controllers/application_controller.rb
similarity index 100%
rename from rails/map-mash/app/controllers/application_controller.rb
rename to map-mash/app/controllers/application_controller.rb
diff --git a/rails/map-mash/app/controllers/maps_controller.rb b/map-mash/app/controllers/maps_controller.rb
similarity index 100%
rename from rails/map-mash/app/controllers/maps_controller.rb
rename to map-mash/app/controllers/maps_controller.rb
diff --git a/rails/map-mash/app/controllers/mash_tournaments_controller.rb b/map-mash/app/controllers/mash_tournaments_controller.rb
similarity index 100%
rename from rails/map-mash/app/controllers/mash_tournaments_controller.rb
rename to map-mash/app/controllers/mash_tournaments_controller.rb
diff --git a/rails/map-mash/app/controllers/mashes_controller.rb b/map-mash/app/controllers/mashes_controller.rb
similarity index 100%
rename from rails/map-mash/app/controllers/mashes_controller.rb
rename to map-mash/app/controllers/mashes_controller.rb
diff --git a/rails/map-mash/app/helpers/application_helper.rb b/map-mash/app/helpers/application_helper.rb
similarity index 100%
rename from rails/map-mash/app/helpers/application_helper.rb
rename to map-mash/app/helpers/application_helper.rb
diff --git a/rails/map-mash/app/helpers/maps_helper.rb b/map-mash/app/helpers/maps_helper.rb
similarity index 100%
rename from rails/map-mash/app/helpers/maps_helper.rb
rename to map-mash/app/helpers/maps_helper.rb
diff --git a/rails/map-mash/app/helpers/mash_tournaments_helper.rb b/map-mash/app/helpers/mash_tournaments_helper.rb
similarity index 100%
rename from rails/map-mash/app/helpers/mash_tournaments_helper.rb
rename to map-mash/app/helpers/mash_tournaments_helper.rb
diff --git a/rails/map-mash/app/helpers/mashes_helper.rb b/map-mash/app/helpers/mashes_helper.rb
similarity index 100%
rename from rails/map-mash/app/helpers/mashes_helper.rb
rename to map-mash/app/helpers/mashes_helper.rb
diff --git a/rails/map-mash/app/models/map.rb b/map-mash/app/models/map.rb
similarity index 100%
rename from rails/map-mash/app/models/map.rb
rename to map-mash/app/models/map.rb
diff --git a/rails/map-mash/app/models/mash.rb b/map-mash/app/models/mash.rb
similarity index 100%
rename from rails/map-mash/app/models/mash.rb
rename to map-mash/app/models/mash.rb
diff --git a/rails/map-mash/app/models/mash_tournament.rb b/map-mash/app/models/mash_tournament.rb
similarity index 100%
rename from rails/map-mash/app/models/mash_tournament.rb
rename to map-mash/app/models/mash_tournament.rb
diff --git a/rails/map-mash/app/models/mash_tournament_round.rb b/map-mash/app/models/mash_tournament_round.rb
similarity index 100%
rename from rails/map-mash/app/models/mash_tournament_round.rb
rename to map-mash/app/models/mash_tournament_round.rb
diff --git a/rails/map-mash/app/models/requester.rb b/map-mash/app/models/requester.rb
similarity index 100%
rename from rails/map-mash/app/models/requester.rb
rename to map-mash/app/models/requester.rb
diff --git a/rails/map-mash/app/views/layouts/mash_tournaments.html.erb b/map-mash/app/views/layouts/mash_tournaments.html.erb
similarity index 100%
rename from rails/map-mash/app/views/layouts/mash_tournaments.html.erb
rename to map-mash/app/views/layouts/mash_tournaments.html.erb
diff --git a/rails/map-mash/app/views/layouts/mashes.html.erb b/map-mash/app/views/layouts/mashes.html.erb
similarity index 100%
rename from rails/map-mash/app/views/layouts/mashes.html.erb
rename to map-mash/app/views/layouts/mashes.html.erb
diff --git a/rails/map-mash/app/views/maps/edit.html.erb b/map-mash/app/views/maps/edit.html.erb
similarity index 100%
rename from rails/map-mash/app/views/maps/edit.html.erb
rename to map-mash/app/views/maps/edit.html.erb
diff --git a/rails/map-mash/app/views/maps/index.html.erb b/map-mash/app/views/maps/index.html.erb
similarity index 100%
rename from rails/map-mash/app/views/maps/index.html.erb
rename to map-mash/app/views/maps/index.html.erb
diff --git a/rails/map-mash/app/views/maps/new.html.erb b/map-mash/app/views/maps/new.html.erb
similarity index 100%
rename from rails/map-mash/app/views/maps/new.html.erb
rename to map-mash/app/views/maps/new.html.erb
diff --git a/rails/map-mash/app/views/maps/show.html.erb b/map-mash/app/views/maps/show.html.erb
similarity index 100%
rename from rails/map-mash/app/views/maps/show.html.erb
rename to map-mash/app/views/maps/show.html.erb
diff --git a/rails/map-mash/app/views/mash_tournaments/edit.html.erb b/map-mash/app/views/mash_tournaments/edit.html.erb
similarity index 100%
rename from rails/map-mash/app/views/mash_tournaments/edit.html.erb
rename to map-mash/app/views/mash_tournaments/edit.html.erb
diff --git a/rails/map-mash/app/views/mash_tournaments/index.html.erb b/map-mash/app/views/mash_tournaments/index.html.erb
similarity index 100%
rename from rails/map-mash/app/views/mash_tournaments/index.html.erb
rename to map-mash/app/views/mash_tournaments/index.html.erb
diff --git a/rails/map-mash/app/views/mash_tournaments/new.html.haml b/map-mash/app/views/mash_tournaments/new.html.haml
similarity index 100%
rename from rails/map-mash/app/views/mash_tournaments/new.html.haml
rename to map-mash/app/views/mash_tournaments/new.html.haml
diff --git a/rails/map-mash/app/views/mash_tournaments/show.html.haml b/map-mash/app/views/mash_tournaments/show.html.haml
similarity index 100%
rename from rails/map-mash/app/views/mash_tournaments/show.html.haml
rename to map-mash/app/views/mash_tournaments/show.html.haml
diff --git a/rails/map-mash/app/views/mashes/new.html.haml b/map-mash/app/views/mashes/new.html.haml
similarity index 100%
rename from rails/map-mash/app/views/mashes/new.html.haml
rename to map-mash/app/views/mashes/new.html.haml
diff --git a/rails/map-mash/config/boot.rb b/map-mash/config/boot.rb
similarity index 100%
rename from rails/map-mash/config/boot.rb
rename to map-mash/config/boot.rb
diff --git a/rails/map-mash/config/database.yml b/map-mash/config/database.yml
similarity index 100%
rename from rails/map-mash/config/database.yml
rename to map-mash/config/database.yml
diff --git a/rails/map-mash/config/environment.rb b/map-mash/config/environment.rb
similarity index 100%
rename from rails/map-mash/config/environment.rb
rename to map-mash/config/environment.rb
diff --git a/rails/map-mash/config/environments/development.rb b/map-mash/config/environments/development.rb
similarity index 100%
rename from rails/map-mash/config/environments/development.rb
rename to map-mash/config/environments/development.rb
diff --git a/rails/map-mash/config/environments/production.rb b/map-mash/config/environments/production.rb
similarity index 100%
rename from rails/map-mash/config/environments/production.rb
rename to map-mash/config/environments/production.rb
diff --git a/rails/map-mash/config/environments/test.rb b/map-mash/config/environments/test.rb
similarity index 100%
rename from rails/map-mash/config/environments/test.rb
rename to map-mash/config/environments/test.rb
diff --git a/rails/map-mash/config/initializers/01-settings.rb b/map-mash/config/initializers/01-settings.rb
similarity index 100%
rename from rails/map-mash/config/initializers/01-settings.rb
rename to map-mash/config/initializers/01-settings.rb
diff --git a/rails/map-mash/config/initializers/backtrace_silencers.rb b/map-mash/config/initializers/backtrace_silencers.rb
similarity index 100%
rename from rails/map-mash/config/initializers/backtrace_silencers.rb
rename to map-mash/config/initializers/backtrace_silencers.rb
diff --git a/rails/map-mash/config/initializers/inflections.rb b/map-mash/config/initializers/inflections.rb
similarity index 100%
rename from rails/map-mash/config/initializers/inflections.rb
rename to map-mash/config/initializers/inflections.rb
diff --git a/rails/map-mash/config/initializers/mime_types.rb b/map-mash/config/initializers/mime_types.rb
similarity index 100%
rename from rails/map-mash/config/initializers/mime_types.rb
rename to map-mash/config/initializers/mime_types.rb
diff --git a/rails/map-mash/config/initializers/new_rails_defaults.rb b/map-mash/config/initializers/new_rails_defaults.rb
similarity index 100%
rename from rails/map-mash/config/initializers/new_rails_defaults.rb
rename to map-mash/config/initializers/new_rails_defaults.rb
diff --git a/rails/map-mash/config/initializers/redis_conf.rb b/map-mash/config/initializers/redis_conf.rb
similarity index 100%
rename from rails/map-mash/config/initializers/redis_conf.rb
rename to map-mash/config/initializers/redis_conf.rb
diff --git a/rails/map-mash/config/initializers/session_store.rb b/map-mash/config/initializers/session_store.rb
similarity index 100%
rename from rails/map-mash/config/initializers/session_store.rb
rename to map-mash/config/initializers/session_store.rb
diff --git a/rails/map-mash/config/locales/en.yml b/map-mash/config/locales/en.yml
similarity index 100%
rename from rails/map-mash/config/locales/en.yml
rename to map-mash/config/locales/en.yml
diff --git a/rails/map-mash/config/redis.conf.erb b/map-mash/config/redis.conf.erb
similarity index 100%
rename from rails/map-mash/config/redis.conf.erb
rename to map-mash/config/redis.conf.erb
diff --git a/rails/map-mash/config/routes.rb b/map-mash/config/routes.rb
similarity index 100%
rename from rails/map-mash/config/routes.rb
rename to map-mash/config/routes.rb
diff --git a/rails/map-mash/config/settings.yml b/map-mash/config/settings.yml
similarity index 100%
rename from rails/map-mash/config/settings.yml
rename to map-mash/config/settings.yml
diff --git a/rails/map-mash/db/capital-cities.csv b/map-mash/db/capital-cities.csv
similarity index 100%
rename from rails/map-mash/db/capital-cities.csv
rename to map-mash/db/capital-cities.csv
diff --git a/rails/map-mash/db/migrate/20120304151123_create_maps.rb b/map-mash/db/migrate/20120304151123_create_maps.rb
similarity index 100%
rename from rails/map-mash/db/migrate/20120304151123_create_maps.rb
rename to map-mash/db/migrate/20120304151123_create_maps.rb
diff --git a/rails/map-mash/db/migrate/20120304164625_create_mashes.rb b/map-mash/db/migrate/20120304164625_create_mashes.rb
similarity index 100%
rename from rails/map-mash/db/migrate/20120304164625_create_mashes.rb
rename to map-mash/db/migrate/20120304164625_create_mashes.rb
diff --git a/rails/map-mash/db/migrate/20120309000749_create_requesters.rb b/map-mash/db/migrate/20120309000749_create_requesters.rb
similarity index 100%
rename from rails/map-mash/db/migrate/20120309000749_create_requesters.rb
rename to map-mash/db/migrate/20120309000749_create_requesters.rb
diff --git a/rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb b/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb
similarity index 100%
rename from rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb
rename to map-mash/db/migrate/20120309130609_create_mash_tournaments.rb
diff --git a/rails/map-mash/db/migrate/20120310035133_create_mash_tournament_rounds.rb b/map-mash/db/migrate/20120310035133_create_mash_tournament_rounds.rb
similarity index 100%
rename from rails/map-mash/db/migrate/20120310035133_create_mash_tournament_rounds.rb
rename to map-mash/db/migrate/20120310035133_create_mash_tournament_rounds.rb
diff --git a/rails/map-mash/db/schema.rb b/map-mash/db/schema.rb
similarity index 100%
rename from rails/map-mash/db/schema.rb
rename to map-mash/db/schema.rb
diff --git a/rails/map-mash/db/top-us-cities.csv b/map-mash/db/top-us-cities.csv
similarity index 100%
rename from rails/map-mash/db/top-us-cities.csv
rename to map-mash/db/top-us-cities.csv
diff --git a/rails/map-mash/doc/README_FOR_APP b/map-mash/doc/README_FOR_APP
similarity index 100%
rename from rails/map-mash/doc/README_FOR_APP
rename to map-mash/doc/README_FOR_APP
diff --git a/rails/map-mash/lib/google_map_location_fetcher.rb b/map-mash/lib/google_map_location_fetcher.rb
similarity index 100%
rename from rails/map-mash/lib/google_map_location_fetcher.rb
rename to map-mash/lib/google_map_location_fetcher.rb
diff --git a/rails/map-mash/lib/mash_tournament_builder.rb b/map-mash/lib/mash_tournament_builder.rb
similarity index 100%
rename from rails/map-mash/lib/mash_tournament_builder.rb
rename to map-mash/lib/mash_tournament_builder.rb
diff --git a/rails/map-mash/lib/tasks/maps.rake b/map-mash/lib/tasks/maps.rake
similarity index 100%
rename from rails/map-mash/lib/tasks/maps.rake
rename to map-mash/lib/tasks/maps.rake
diff --git a/rails/map-mash/lib/tasks/rspec.rake b/map-mash/lib/tasks/rspec.rake
similarity index 100%
rename from rails/map-mash/lib/tasks/rspec.rake
rename to map-mash/lib/tasks/rspec.rake
diff --git a/rails/map-mash/log/.gitkeep b/map-mash/log/.gitkeep
similarity index 100%
rename from rails/map-mash/log/.gitkeep
rename to map-mash/log/.gitkeep
diff --git a/rails/map-mash/public/404.html b/map-mash/public/404.html
similarity index 100%
rename from rails/map-mash/public/404.html
rename to map-mash/public/404.html
diff --git a/rails/map-mash/public/422.html b/map-mash/public/422.html
similarity index 100%
rename from rails/map-mash/public/422.html
rename to map-mash/public/422.html
diff --git a/rails/map-mash/public/500.html b/map-mash/public/500.html
similarity index 100%
rename from rails/map-mash/public/500.html
rename to map-mash/public/500.html
diff --git a/rails/map-mash/public/favicon.ico b/map-mash/public/favicon.ico
similarity index 100%
rename from rails/map-mash/public/favicon.ico
rename to map-mash/public/favicon.ico
diff --git a/rails/map-mash/public/images/rails.png b/map-mash/public/images/rails.png
similarity index 100%
rename from rails/map-mash/public/images/rails.png
rename to map-mash/public/images/rails.png
diff --git a/rails/map-mash/public/javascripts/application.js b/map-mash/public/javascripts/application.js
similarity index 100%
rename from rails/map-mash/public/javascripts/application.js
rename to map-mash/public/javascripts/application.js
diff --git a/rails/map-mash/public/javascripts/controls.js b/map-mash/public/javascripts/controls.js
similarity index 100%
rename from rails/map-mash/public/javascripts/controls.js
rename to map-mash/public/javascripts/controls.js
diff --git a/rails/map-mash/public/javascripts/dragdrop.js b/map-mash/public/javascripts/dragdrop.js
similarity index 100%
rename from rails/map-mash/public/javascripts/dragdrop.js
rename to map-mash/public/javascripts/dragdrop.js
diff --git a/rails/map-mash/public/javascripts/effects.js b/map-mash/public/javascripts/effects.js
similarity index 100%
rename from rails/map-mash/public/javascripts/effects.js
rename to map-mash/public/javascripts/effects.js
diff --git a/rails/map-mash/public/javascripts/jquery.js b/map-mash/public/javascripts/jquery.js
similarity index 100%
rename from rails/map-mash/public/javascripts/jquery.js
rename to map-mash/public/javascripts/jquery.js
diff --git a/rails/map-mash/public/javascripts/jquery.min.js b/map-mash/public/javascripts/jquery.min.js
similarity index 100%
rename from rails/map-mash/public/javascripts/jquery.min.js
rename to map-mash/public/javascripts/jquery.min.js
diff --git a/rails/map-mash/public/javascripts/prototype.js b/map-mash/public/javascripts/prototype.js
similarity index 100%
rename from rails/map-mash/public/javascripts/prototype.js
rename to map-mash/public/javascripts/prototype.js
diff --git a/rails/map-mash/public/robots.txt b/map-mash/public/robots.txt
similarity index 100%
rename from rails/map-mash/public/robots.txt
rename to map-mash/public/robots.txt
diff --git a/rails/map-mash/public/stylesheets/scaffold.css b/map-mash/public/stylesheets/scaffold.css
similarity index 100%
rename from rails/map-mash/public/stylesheets/scaffold.css
rename to map-mash/public/stylesheets/scaffold.css
diff --git a/rails/map-mash/public/stylesheets/styles.css b/map-mash/public/stylesheets/styles.css
similarity index 100%
rename from rails/map-mash/public/stylesheets/styles.css
rename to map-mash/public/stylesheets/styles.css
diff --git a/rails/map-mash/script/about b/map-mash/script/about
similarity index 100%
rename from rails/map-mash/script/about
rename to map-mash/script/about
diff --git a/rails/map-mash/script/autospec b/map-mash/script/autospec
similarity index 100%
rename from rails/map-mash/script/autospec
rename to map-mash/script/autospec
diff --git a/rails/map-mash/script/console b/map-mash/script/console
similarity index 100%
rename from rails/map-mash/script/console
rename to map-mash/script/console
diff --git a/rails/map-mash/script/dbconsole b/map-mash/script/dbconsole
similarity index 100%
rename from rails/map-mash/script/dbconsole
rename to map-mash/script/dbconsole
diff --git a/rails/map-mash/script/destroy b/map-mash/script/destroy
similarity index 100%
rename from rails/map-mash/script/destroy
rename to map-mash/script/destroy
diff --git a/rails/map-mash/script/dev-reset b/map-mash/script/dev-reset
similarity index 100%
rename from rails/map-mash/script/dev-reset
rename to map-mash/script/dev-reset
diff --git a/rails/map-mash/script/generate b/map-mash/script/generate
similarity index 100%
rename from rails/map-mash/script/generate
rename to map-mash/script/generate
diff --git a/rails/map-mash/script/performance/benchmarker b/map-mash/script/performance/benchmarker
similarity index 100%
rename from rails/map-mash/script/performance/benchmarker
rename to map-mash/script/performance/benchmarker
diff --git a/rails/map-mash/script/performance/profiler b/map-mash/script/performance/profiler
similarity index 100%
rename from rails/map-mash/script/performance/profiler
rename to map-mash/script/performance/profiler
diff --git a/rails/map-mash/script/plugin b/map-mash/script/plugin
similarity index 100%
rename from rails/map-mash/script/plugin
rename to map-mash/script/plugin
diff --git a/rails/map-mash/script/redis-runner b/map-mash/script/redis-runner
similarity index 100%
rename from rails/map-mash/script/redis-runner
rename to map-mash/script/redis-runner
diff --git a/rails/map-mash/script/resque-web-runner b/map-mash/script/resque-web-runner
similarity index 100%
rename from rails/map-mash/script/resque-web-runner
rename to map-mash/script/resque-web-runner
diff --git a/rails/map-mash/script/runner b/map-mash/script/runner
similarity index 100%
rename from rails/map-mash/script/runner
rename to map-mash/script/runner
diff --git a/rails/map-mash/script/server b/map-mash/script/server
similarity index 100%
rename from rails/map-mash/script/server
rename to map-mash/script/server
diff --git a/rails/map-mash/script/spec b/map-mash/script/spec
similarity index 100%
rename from rails/map-mash/script/spec
rename to map-mash/script/spec
diff --git a/rails/map-mash/spec/blueprints.rb b/map-mash/spec/blueprints.rb
similarity index 100%
rename from rails/map-mash/spec/blueprints.rb
rename to map-mash/spec/blueprints.rb
diff --git a/rails/map-mash/spec/controllers/maps_controller_spec.rb b/map-mash/spec/controllers/maps_controller_spec.rb
similarity index 100%
rename from rails/map-mash/spec/controllers/maps_controller_spec.rb
rename to map-mash/spec/controllers/maps_controller_spec.rb
diff --git a/rails/map-mash/spec/controllers/mash_tournaments_controller_spec.rb b/map-mash/spec/controllers/mash_tournaments_controller_spec.rb
similarity index 100%
rename from rails/map-mash/spec/controllers/mash_tournaments_controller_spec.rb
rename to map-mash/spec/controllers/mash_tournaments_controller_spec.rb
diff --git a/rails/map-mash/spec/controllers/mashes_controller_spec.rb b/map-mash/spec/controllers/mashes_controller_spec.rb
similarity index 100%
rename from rails/map-mash/spec/controllers/mashes_controller_spec.rb
rename to map-mash/spec/controllers/mashes_controller_spec.rb
diff --git a/rails/map-mash/spec/fixtures/maps.yml b/map-mash/spec/fixtures/maps.yml
similarity index 100%
rename from rails/map-mash/spec/fixtures/maps.yml
rename to map-mash/spec/fixtures/maps.yml
diff --git a/rails/map-mash/spec/fixtures/mash_tournaments.yml b/map-mash/spec/fixtures/mash_tournaments.yml
similarity index 100%
rename from rails/map-mash/spec/fixtures/mash_tournaments.yml
rename to map-mash/spec/fixtures/mash_tournaments.yml
diff --git a/rails/map-mash/spec/fixtures/mashes.yml b/map-mash/spec/fixtures/mashes.yml
similarity index 100%
rename from rails/map-mash/spec/fixtures/mashes.yml
rename to map-mash/spec/fixtures/mashes.yml
diff --git a/rails/map-mash/spec/fixtures/requesters.yml b/map-mash/spec/fixtures/requesters.yml
similarity index 100%
rename from rails/map-mash/spec/fixtures/requesters.yml
rename to map-mash/spec/fixtures/requesters.yml
diff --git a/rails/map-mash/spec/helpers/maps_helper_spec.rb b/map-mash/spec/helpers/maps_helper_spec.rb
similarity index 100%
rename from rails/map-mash/spec/helpers/maps_helper_spec.rb
rename to map-mash/spec/helpers/maps_helper_spec.rb
diff --git a/rails/map-mash/spec/helpers/mash_tournaments_helper_spec.rb b/map-mash/spec/helpers/mash_tournaments_helper_spec.rb
similarity index 100%
rename from rails/map-mash/spec/helpers/mash_tournaments_helper_spec.rb
rename to map-mash/spec/helpers/mash_tournaments_helper_spec.rb
diff --git a/rails/map-mash/spec/helpers/mashes_helper_spec.rb b/map-mash/spec/helpers/mashes_helper_spec.rb
similarity index 100%
rename from rails/map-mash/spec/helpers/mashes_helper_spec.rb
rename to map-mash/spec/helpers/mashes_helper_spec.rb
diff --git a/rails/map-mash/spec/integration/maps_spec.rb b/map-mash/spec/integration/maps_spec.rb
similarity index 100%
rename from rails/map-mash/spec/integration/maps_spec.rb
rename to map-mash/spec/integration/maps_spec.rb
diff --git a/rails/map-mash/spec/integration/mash_tournaments_spec.rb b/map-mash/spec/integration/mash_tournaments_spec.rb
similarity index 100%
rename from rails/map-mash/spec/integration/mash_tournaments_spec.rb
rename to map-mash/spec/integration/mash_tournaments_spec.rb
diff --git a/rails/map-mash/spec/integration/mashes_spec.rb b/map-mash/spec/integration/mashes_spec.rb
similarity index 100%
rename from rails/map-mash/spec/integration/mashes_spec.rb
rename to map-mash/spec/integration/mashes_spec.rb
diff --git a/rails/map-mash/spec/lib/mash_tournament_builder_spec.rb b/map-mash/spec/lib/mash_tournament_builder_spec.rb
similarity index 100%
rename from rails/map-mash/spec/lib/mash_tournament_builder_spec.rb
rename to map-mash/spec/lib/mash_tournament_builder_spec.rb
diff --git a/rails/map-mash/spec/models/map_spec.rb b/map-mash/spec/models/map_spec.rb
similarity index 100%
rename from rails/map-mash/spec/models/map_spec.rb
rename to map-mash/spec/models/map_spec.rb
diff --git a/rails/map-mash/spec/models/mash_tournament_spec.rb b/map-mash/spec/models/mash_tournament_spec.rb
similarity index 100%
rename from rails/map-mash/spec/models/mash_tournament_spec.rb
rename to map-mash/spec/models/mash_tournament_spec.rb
diff --git a/rails/map-mash/spec/models/requester_spec.rb b/map-mash/spec/models/requester_spec.rb
similarity index 100%
rename from rails/map-mash/spec/models/requester_spec.rb
rename to map-mash/spec/models/requester_spec.rb
diff --git a/rails/map-mash/spec/rcov.opts b/map-mash/spec/rcov.opts
similarity index 100%
rename from rails/map-mash/spec/rcov.opts
rename to map-mash/spec/rcov.opts
diff --git a/rails/map-mash/spec/routing/maps_routing_spec.rb b/map-mash/spec/routing/maps_routing_spec.rb
similarity index 100%
rename from rails/map-mash/spec/routing/maps_routing_spec.rb
rename to map-mash/spec/routing/maps_routing_spec.rb
diff --git a/rails/map-mash/spec/routing/mash_tournaments_routing_spec.rb b/map-mash/spec/routing/mash_tournaments_routing_spec.rb
similarity index 100%
rename from rails/map-mash/spec/routing/mash_tournaments_routing_spec.rb
rename to map-mash/spec/routing/mash_tournaments_routing_spec.rb
diff --git a/rails/map-mash/spec/routing/mashes_routing_spec.rb b/map-mash/spec/routing/mashes_routing_spec.rb
similarity index 100%
rename from rails/map-mash/spec/routing/mashes_routing_spec.rb
rename to map-mash/spec/routing/mashes_routing_spec.rb
diff --git a/rails/map-mash/spec/spec.opts b/map-mash/spec/spec.opts
similarity index 100%
rename from rails/map-mash/spec/spec.opts
rename to map-mash/spec/spec.opts
diff --git a/rails/map-mash/spec/spec_helper.rb b/map-mash/spec/spec_helper.rb
similarity index 100%
rename from rails/map-mash/spec/spec_helper.rb
rename to map-mash/spec/spec_helper.rb
diff --git a/rails/map-mash/spec/views/maps/edit.html.erb_spec.rb b/map-mash/spec/views/maps/edit.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/maps/edit.html.erb_spec.rb
rename to map-mash/spec/views/maps/edit.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/maps/index.html.erb_spec.rb b/map-mash/spec/views/maps/index.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/maps/index.html.erb_spec.rb
rename to map-mash/spec/views/maps/index.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/maps/new.html.erb_spec.rb b/map-mash/spec/views/maps/new.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/maps/new.html.erb_spec.rb
rename to map-mash/spec/views/maps/new.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/maps/show.html.erb_spec.rb b/map-mash/spec/views/maps/show.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/maps/show.html.erb_spec.rb
rename to map-mash/spec/views/maps/show.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb b/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb
rename to map-mash/spec/views/mash_tournaments/edit.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb b/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb
rename to map-mash/spec/views/mash_tournaments/index.html.erb_spec.rb
diff --git a/rails/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb b/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb
similarity index 100%
rename from rails/map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb
rename to map-mash/spec/views/mash_tournaments/new.html.erb_spec.rb
diff --git a/rails/.gitignore b/rails/.gitignore
deleted file mode 100644
index a0cf52b..0000000
--- a/rails/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.rbenv-version
diff --git a/redis/with-ruby/.gitignore b/redis/.gitignore
similarity index 100%
rename from redis/with-ruby/.gitignore
rename to redis/.gitignore
diff --git a/redis/with-ruby/Gemfile b/redis/Gemfile
similarity index 100%
rename from redis/with-ruby/Gemfile
rename to redis/Gemfile
diff --git a/redis/with-ruby/Gemfile.lock b/redis/Gemfile.lock
similarity index 100%
rename from redis/with-ruby/Gemfile.lock
rename to redis/Gemfile.lock
diff --git a/redis/with-ruby/Rakefile b/redis/Rakefile
similarity index 100%
rename from redis/with-ruby/Rakefile
rename to redis/Rakefile
diff --git a/redis/with-ruby/earthquakes.rb b/redis/earthquakes.rb
similarity index 100%
rename from redis/with-ruby/earthquakes.rb
rename to redis/earthquakes.rb
diff --git a/redis/with-ruby/eq-info.rb b/redis/eq-info.rb
similarity index 100%
rename from redis/with-ruby/eq-info.rb
rename to redis/eq-info.rb
diff --git a/redis/with-ruby/in-and-out.rb b/redis/in-and-out.rb
similarity index 100%
rename from redis/with-ruby/in-and-out.rb
rename to redis/in-and-out.rb