diff --git a/app/config.ru b/apps/site/config.ru
similarity index 81%
rename from app/config.ru
rename to apps/site/config.ru
index e1f1f986b02..393a6b93e11 100644
--- a/app/config.ru
+++ b/apps/site/config.ru
@@ -2,7 +2,7 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__)))
 
 require 'rubygems'
 require 'sinatra'
-require 'app'
+require 'site'
 
 set :environment, :production
-run Gem::App
+run Gem::Site
diff --git a/app/cutter.rb b/apps/site/cutter.rb
similarity index 100%
rename from app/cutter.rb
rename to apps/site/cutter.rb
diff --git a/app/indexer.rb b/apps/site/indexer.rb
similarity index 100%
rename from app/indexer.rb
rename to apps/site/indexer.rb
diff --git a/app/public/colors.png b/apps/site/public/colors.png
similarity index 100%
rename from app/public/colors.png
rename to apps/site/public/colors.png
diff --git a/app/public/css/960.css b/apps/site/public/css/960.css
similarity index 100%
rename from app/public/css/960.css
rename to apps/site/public/css/960.css
diff --git a/app/public/css/reset.css b/apps/site/public/css/reset.css
similarity index 100%
rename from app/public/css/reset.css
rename to apps/site/public/css/reset.css
diff --git a/app/public/css/style.css b/apps/site/public/css/style.css
similarity index 100%
rename from app/public/css/style.css
rename to apps/site/public/css/style.css
diff --git a/app/public/css/text.css b/apps/site/public/css/text.css
similarity index 100%
rename from app/public/css/text.css
rename to apps/site/public/css/text.css
diff --git a/app/public/favicon.ico b/apps/site/public/favicon.ico
similarity index 100%
rename from app/public/favicon.ico
rename to apps/site/public/favicon.ico
diff --git a/app/public/gemcutter.jpg b/apps/site/public/gemcutter.jpg
similarity index 100%
rename from app/public/gemcutter.jpg
rename to apps/site/public/gemcutter.jpg
diff --git a/app/app.rb b/apps/site/site.rb
similarity index 97%
rename from app/app.rb
rename to apps/site/site.rb
index 596e9350fa2..b35d4fb38eb 100644
--- a/app/app.rb
+++ b/apps/site/site.rb
@@ -12,7 +12,7 @@
 Gem.configuration.verbose = false
 
 module Gem
-  class App < Sinatra::Default
+  class Site < Sinatra::Default
     set :app_file, __FILE__
 
     get '/' do
diff --git a/app/views/gem.haml b/apps/site/views/gem.haml
similarity index 100%
rename from app/views/gem.haml
rename to apps/site/views/gem.haml
diff --git a/app/views/gems.haml b/apps/site/views/gems.haml
similarity index 100%
rename from app/views/gems.haml
rename to apps/site/views/gems.haml
diff --git a/app/views/index.haml b/apps/site/views/index.haml
similarity index 100%
rename from app/views/index.haml
rename to apps/site/views/index.haml
diff --git a/app/views/layout.haml b/apps/site/views/layout.haml
similarity index 100%
rename from app/views/layout.haml
rename to apps/site/views/layout.haml
diff --git a/server/quick/Marshal.4.8/.gitignore b/server/quick/Marshal.4.8/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/spec/cutter_spec.rb b/spec/cutter_spec.rb
index 16595534460..8d77769feb8 100644
--- a/spec/cutter_spec.rb
+++ b/spec/cutter_spec.rb
@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'apps/site/site'
 
 describe Gem::Cutter do
   def stub_spec
diff --git a/spec/app_spec.rb b/spec/site_spec.rb
similarity index 97%
rename from spec/app_spec.rb
rename to spec/site_spec.rb
index 758f93e863b..26b9bf3dfd5 100644
--- a/spec/app_spec.rb
+++ b/spec/site_spec.rb
@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
-require 'app/app'
+require 'apps/site/site'
 
-describe Gem::App do
+describe Gem::Site do
   def app
-    Gem::App.new
+    Gem::Site.new
   end
 
   it "should have a homepage" do