diff --git a/controllers/updates_controller.rb b/controllers/updates_controller.rb
index 2366f438..42bb42c3 100644
--- a/controllers/updates_controller.rb
+++ b/controllers/updates_controller.rb
@@ -34,7 +34,7 @@ class Rstatus
       set_pagination_buttons(@updates)
       haml :"updates/index"
     else
-      haml :index, :layout => false
+      haml :"static/home", :layout => false
     end
   end
 
@@ -101,7 +101,7 @@ class Rstatus
   get '/updates/:id' do
     @update = Update.first :id => params[:id]
     @referral = @update.referral
-    haml :"updates/show", :layout => :'updates/layout'
+    haml :"updates/show", :layout => :'layout/update'
   end
 
   # Hopefully people don't delete a whole bunch of their updates, but if they
diff --git a/rstatus.rb b/rstatus.rb
index 215c8211..c11a94ac 100644
--- a/rstatus.rb
+++ b/rstatus.rb
@@ -84,13 +84,13 @@ class Rstatus
     if logged_in?
       call! env.merge("PATH_INFO" => '/timeline')
     else
-      haml :index, :layout => false
+      haml :"static/home", :layout => false
     end
   end
 
   get '/home' do
     cache_control :public, :must_revalidate, :max_age => 60
-    haml :index, :layout => false
+    haml :"static/home", :layout => false
   end
 
   post '/signup' do
@@ -118,11 +118,11 @@ class Rstatus
   end
 
   not_found do
-    haml :'error', :layout => false, :locals => {:code => 404, :message => "We couldn't find the page you're looking for"}
+    haml :"static/error", :layout => false, :locals => {:code => 404, :message => "We couldn't find the page you're looking for"}
   end
 
   error do
-    haml :'error', :layout => false, :locals => {:code => 500, :message => "Something went wrong"}
+    haml :"static/error", :layout => false, :locals => {:code => 500, :message => "Something went wrong"}
   end
 
 end
diff --git a/tasks/rocco.rake b/tasks/rocco.rake
index 4d15a765..fe444298 100644
--- a/tasks/rocco.rake
+++ b/tasks/rocco.rake
@@ -19,8 +19,8 @@ begin
     CLEAN.include "docs/#{css}"
   end
 
-  file 'docs/index.html' => 'views/doc_index.haml' do |f|
-    system("haml -rrdiscount views/doc_index.haml docs/index.html")
+  file 'docs/index.html' => 'views/static/doc_index.haml' do |f|
+    system("haml -rrdiscount views/static/doc_index.haml docs/index.html")
   end
 
   task :docs => 'docs/index.html'
diff --git a/views/updates/layout.haml b/views/layout/update.haml
similarity index 100%
rename from views/updates/layout.haml
rename to views/layout/update.haml
diff --git a/views/doc_index.haml b/views/static/doc_index.haml
similarity index 100%
rename from views/doc_index.haml
rename to views/static/doc_index.haml
diff --git a/views/error.haml b/views/static/error.haml
similarity index 100%
rename from views/error.haml
rename to views/static/error.haml
diff --git a/views/index.haml b/views/static/home.haml
similarity index 100%
rename from views/index.haml
rename to views/static/home.haml