diff --git a/Gemfile b/Gemfile
index e1e36cda..3a2b8cf1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby '2.1.2'
 
-gem 'travis-web', path: 'server'
+gem 'travis-web', path: 'waiter'
 gem 'puma'
 gem 'rack-ssl', '~> 1.3'
 gem 'rack-protection', '~> 1.3'
diff --git a/Procfile b/Procfile
index 7990da73..5297e6dd 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
-web: bundle exec rackup -s puma -p $PORT server/config.ru
+web: bundle exec rackup -s puma -p $PORT waiter/config.ru
 assets: rerun -x -p 'assets/**/*' 'bundle exec rakep'
 #specs: rerun -x -p 'public/**/*' './run_jasmine.coffee public/spec.html'
diff --git a/server/Rakefile b/waiter/Rakefile
similarity index 100%
rename from server/Rakefile
rename to waiter/Rakefile
diff --git a/server/config.ru b/waiter/config.ru
similarity index 100%
rename from server/config.ru
rename to waiter/config.ru
diff --git a/server/lib/travis/web.rb b/waiter/lib/travis/web.rb
similarity index 100%
rename from server/lib/travis/web.rb
rename to waiter/lib/travis/web.rb
diff --git a/server/lib/travis/web/allow.rb b/waiter/lib/travis/web/allow.rb
similarity index 100%
rename from server/lib/travis/web/allow.rb
rename to waiter/lib/travis/web/allow.rb
diff --git a/server/lib/travis/web/api_redirect.rb b/waiter/lib/travis/web/api_redirect.rb
similarity index 100%
rename from server/lib/travis/web/api_redirect.rb
rename to waiter/lib/travis/web/api_redirect.rb
diff --git a/server/lib/travis/web/app.rb b/waiter/lib/travis/web/app.rb
similarity index 100%
rename from server/lib/travis/web/app.rb
rename to waiter/lib/travis/web/app.rb
diff --git a/server/lib/travis/web/app/alt_versions.rb b/waiter/lib/travis/web/app/alt_versions.rb
similarity index 100%
rename from server/lib/travis/web/app/alt_versions.rb
rename to waiter/lib/travis/web/app/alt_versions.rb
diff --git a/server/lib/travis/web/app/mobile_redirect.rb b/waiter/lib/travis/web/app/mobile_redirect.rb
similarity index 100%
rename from server/lib/travis/web/app/mobile_redirect.rb
rename to waiter/lib/travis/web/app/mobile_redirect.rb
diff --git a/server/lib/travis/web/config.rb b/waiter/lib/travis/web/config.rb
similarity index 100%
rename from server/lib/travis/web/config.rb
rename to waiter/lib/travis/web/config.rb
diff --git a/server/lib/travis/web/set_token.rb b/waiter/lib/travis/web/set_token.rb
similarity index 100%
rename from server/lib/travis/web/set_token.rb
rename to waiter/lib/travis/web/set_token.rb
diff --git a/server/script/ci b/waiter/script/ci
similarity index 100%
rename from server/script/ci
rename to waiter/script/ci
diff --git a/server/script/prepare_deploy b/waiter/script/prepare_deploy
similarity index 100%
rename from server/script/prepare_deploy
rename to waiter/script/prepare_deploy
diff --git a/server/script/saucelabs.rb b/waiter/script/saucelabs.rb
similarity index 100%
rename from server/script/saucelabs.rb
rename to waiter/script/saucelabs.rb
diff --git a/server/script/server b/waiter/script/server
similarity index 100%
rename from server/script/server
rename to waiter/script/server
diff --git a/server/spec/allow_spec.rb b/waiter/spec/allow_spec.rb
similarity index 100%
rename from server/spec/allow_spec.rb
rename to waiter/spec/allow_spec.rb
diff --git a/server/spec/api_redirect_spec.rb b/waiter/spec/api_redirect_spec.rb
similarity index 100%
rename from server/spec/api_redirect_spec.rb
rename to waiter/spec/api_redirect_spec.rb
diff --git a/server/spec/app_spec.rb b/waiter/spec/app_spec.rb
similarity index 100%
rename from server/spec/app_spec.rb
rename to waiter/spec/app_spec.rb
diff --git a/server/spec/mobile_redirect_spec.rb b/waiter/spec/mobile_redirect_spec.rb
similarity index 100%
rename from server/spec/mobile_redirect_spec.rb
rename to waiter/spec/mobile_redirect_spec.rb
diff --git a/server/spec/spec_helper.rb b/waiter/spec/spec_helper.rb
similarity index 100%
rename from server/spec/spec_helper.rb
rename to waiter/spec/spec_helper.rb
diff --git a/server/travis-web.gemspec b/waiter/travis-web.gemspec
similarity index 100%
rename from server/travis-web.gemspec
rename to waiter/travis-web.gemspec