diff --git a/.gitignore b/.gitignore
index 97732078..572e021f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pkg
 .tmp
 Gemfile.lock
 docs
+.rvmrc
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 00000000..baea23df
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,4 @@
+2.0.0
+=====
+
+- Combine views/ and public/ into a single source/ folder.
\ No newline at end of file
diff --git a/bin/mm-server b/bin/mm-server
index 10f34bc4..a4a8d391 100755
--- a/bin/mm-server
+++ b/bin/mm-server
@@ -1,22 +1,5 @@
 #!/usr/bin/env ruby
 
-# Non-blocking site rebuilding
-trap("TSTP") do
-  fork do
-    require "open3"
-    first_run = true
-    Open3.popen3(%Q{cd "#{Dir.pwd}" && #{File.join(File.dirname(__FILE__), "mm-build")} | grep FORCED}) do |stdin, stdout, stderr|
-      puts "\n== Building the site..."
-      stdout.readlines.each do |l|
-        puts "== Updated:" if first_run
-        puts " " + l.split("[FORCED]").last.chomp
-        first_run = false
-      end
-      puts "== Build complete"
-    end
-  end
-end if Signal.list.has_key? "TSTP"
-
 require 'optparse'
 
 # Require Middleman
@@ -25,6 +8,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
 options = { :Port => 4567, :AccessLog => [] }
 
+# TODO: Switch to Thor
 OptionParser.new { |opts|
   opts.banner = "Usage: mm-server [rack options]"
   opts.separator ""
@@ -51,10 +35,9 @@ ENV['RACK_ENV'] = env
 while (!@found_root && (@path_parts.length > 0))
   @current_path = File.join(*@path_parts)
   
-  public_folder = File.join(@current_path, "public")
-  views_folder  = File.join(@current_path, "views")
+  source_folder = File.join(@current_path, "source")
   
-  if File.exists?(public_folder) && File.exists?(views_folder)
+  if File.exists?(source_folder)
     @found_root = true
     next
   end
@@ -67,20 +50,25 @@ if !@found_root
   exit
 end
 
-# If the old init.rb exists, use it, but issue warning
+# If the old init.rb exists, issue warning
 old_config = File.join(@current_path, "init.rb")
 if File.exists? old_config
   $stderr.puts "== Error: The init.rb file (deprecated) needs to be be renamed to config.rb"
   exit
 end
 
+# If the old directories exists, use it, but issue warning
+old_views = File.join(@current_path, "views")
+old_public = File.join(@current_path, "public")
+if File.exists?(old_views) || File.exists?(old_public)
+  $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
+  exit
+end
 
-# require 'shotgun'
-# config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
-# app = Shotgun.new(config, &lambda { |inner_app| Middleman::Server })
 Middleman::Server.root = @current_path
 app = Middleman::Server.new
 
+# TODO: Remove this
 require 'rubygems'
 
 unless defined?(JRUBY_VERSION)
diff --git a/features/step_definitions/builder_steps.rb b/features/step_definitions/builder_steps.rb
index eb710dc1..013706c8 100644
--- a/features/step_definitions/builder_steps.rb
+++ b/features/step_definitions/builder_steps.rb
@@ -26,26 +26,4 @@ end
 Then /^"([^"]*)" should not exist$/ do |target_file|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
   File.exists?(target).should be_false
-end
-
-
-
-# require 'fileutils'
-# 
-# describe "Builder" do
-#   def project_file(*parts)
-#     File.expand_path(File.join(File.dirname(__FILE__), "..", *parts))
-#   end
-# 
-#   before :all do
-#     @root_dir = project_file("spec", "fixtures", "sample")
-#   end
-# 
-#   before :each do
-#     build_cmd = project_file("bin", "mm-build")
-#     `cd #{@root_dir} && MM_DIR="#{@root_dir}" #{build_cmd}`
-#   end
-# 
-#   after :each do
-#     FileUtils.rm_rf(File.join(@root_dir, "build"))
-#   end
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/features/step_definitions/generator_steps.rb b/features/step_definitions/generator_steps.rb
index d90adaf8..10ed89f6 100644
--- a/features/step_definitions/generator_steps.rb
+++ b/features/step_definitions/generator_steps.rb
@@ -19,7 +19,7 @@ end
 Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
   
-  %w(views/stylesheets public/stylesheets public/javascripts public/images).each do |d|
+  %w(source/stylesheets source/javascripts source/images).each do |d|
     File.exists?("#{target}/#{d}").should be_true
   end
 end
diff --git a/fixtures/test-app/views/_partial.haml b/fixtures/test-app/source/_partial.haml
similarity index 100%
rename from fixtures/test-app/views/_partial.haml
rename to fixtures/test-app/source/_partial.haml
diff --git a/fixtures/test-app/views/asset_host.html.haml b/fixtures/test-app/source/asset_host.html.haml
similarity index 100%
rename from fixtures/test-app/views/asset_host.html.haml
rename to fixtures/test-app/source/asset_host.html.haml
diff --git a/fixtures/test-app/views/auto-css.html.haml b/fixtures/test-app/source/auto-css.html.haml
similarity index 100%
rename from fixtures/test-app/views/auto-css.html.haml
rename to fixtures/test-app/source/auto-css.html.haml
diff --git a/fixtures/test-app/views/auto-image-sizes.html.haml b/fixtures/test-app/source/auto-image-sizes.html.haml
similarity index 100%
rename from fixtures/test-app/views/auto-image-sizes.html.haml
rename to fixtures/test-app/source/auto-image-sizes.html.haml
diff --git a/fixtures/test-app/views/cache-buster.html.haml b/fixtures/test-app/source/cache-buster.html.haml
similarity index 100%
rename from fixtures/test-app/views/cache-buster.html.haml
rename to fixtures/test-app/source/cache-buster.html.haml
diff --git a/fixtures/test-app/views/custom-layout-dir/index.html.haml b/fixtures/test-app/source/custom-layout-dir/index.html.haml
similarity index 100%
rename from fixtures/test-app/views/custom-layout-dir/index.html.haml
rename to fixtures/test-app/source/custom-layout-dir/index.html.haml
diff --git a/fixtures/test-app/views/custom-layout.html.haml b/fixtures/test-app/source/custom-layout.html.haml
similarity index 100%
rename from fixtures/test-app/views/custom-layout.html.haml
rename to fixtures/test-app/source/custom-layout.html.haml
diff --git a/fixtures/test-app/public/images/blank.gif b/fixtures/test-app/source/images/blank.gif
similarity index 100%
rename from fixtures/test-app/public/images/blank.gif
rename to fixtures/test-app/source/images/blank.gif
diff --git a/fixtures/test-app/views/index.html.haml b/fixtures/test-app/source/index.html.haml
similarity index 100%
rename from fixtures/test-app/views/index.html.haml
rename to fixtures/test-app/source/index.html.haml
diff --git a/fixtures/test-app/views/inline-css.html.haml b/fixtures/test-app/source/inline-css.html.haml
similarity index 100%
rename from fixtures/test-app/views/inline-css.html.haml
rename to fixtures/test-app/source/inline-css.html.haml
diff --git a/fixtures/test-app/views/inline-js.html.haml b/fixtures/test-app/source/inline-js.html.haml
similarity index 100%
rename from fixtures/test-app/views/inline-js.html.haml
rename to fixtures/test-app/source/inline-js.html.haml
diff --git a/fixtures/test-app/views/javascripts/coffee_test.js.coffee b/fixtures/test-app/source/javascripts/coffee_test.js.coffee
similarity index 100%
rename from fixtures/test-app/views/javascripts/coffee_test.js.coffee
rename to fixtures/test-app/source/javascripts/coffee_test.js.coffee
diff --git a/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js b/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
new file mode 100644
index 00000000..2717f3bd
--- /dev/null
+++ b/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
@@ -0,0 +1 @@
+// Success
\ No newline at end of file
diff --git a/fixtures/test-app/views/layout.haml b/fixtures/test-app/source/layout.haml
similarity index 100%
rename from fixtures/test-app/views/layout.haml
rename to fixtures/test-app/source/layout.haml
diff --git a/fixtures/test-app/views/layouts/custom.haml b/fixtures/test-app/source/layouts/custom.haml
similarity index 100%
rename from fixtures/test-app/views/layouts/custom.haml
rename to fixtures/test-app/source/layouts/custom.haml
diff --git a/fixtures/test-app/views/padrino_test.html.haml b/fixtures/test-app/source/padrino_test.html.haml
similarity index 100%
rename from fixtures/test-app/views/padrino_test.html.haml
rename to fixtures/test-app/source/padrino_test.html.haml
diff --git a/fixtures/test-app/views/page-classes.html.haml b/fixtures/test-app/source/page-classes.html.haml
similarity index 100%
rename from fixtures/test-app/views/page-classes.html.haml
rename to fixtures/test-app/source/page-classes.html.haml
diff --git a/fixtures/test-app/views/services/index.html.haml b/fixtures/test-app/source/services/index.html.haml
similarity index 100%
rename from fixtures/test-app/views/services/index.html.haml
rename to fixtures/test-app/source/services/index.html.haml
diff --git a/fixtures/test-app/public/static.html b/fixtures/test-app/source/static.html
similarity index 100%
rename from fixtures/test-app/public/static.html
rename to fixtures/test-app/source/static.html
diff --git a/fixtures/test-app/views/stylesheets/asset_host.css.sass b/fixtures/test-app/source/stylesheets/asset_host.css.sass
similarity index 100%
rename from fixtures/test-app/views/stylesheets/asset_host.css.sass
rename to fixtures/test-app/source/stylesheets/asset_host.css.sass
diff --git a/fixtures/test-app/public/stylesheets/auto-css.css b/fixtures/test-app/source/stylesheets/auto-css.css
similarity index 100%
rename from fixtures/test-app/public/stylesheets/auto-css.css
rename to fixtures/test-app/source/stylesheets/auto-css.css
diff --git a/fixtures/test-app/views/stylesheets/relative_assets.css.sass b/fixtures/test-app/source/stylesheets/relative_assets.css.sass
similarity index 100%
rename from fixtures/test-app/views/stylesheets/relative_assets.css.sass
rename to fixtures/test-app/source/stylesheets/relative_assets.css.sass
diff --git a/fixtures/test-app/views/stylesheets/site.css.sass b/fixtures/test-app/source/stylesheets/site.css.sass
similarity index 100%
rename from fixtures/test-app/views/stylesheets/site.css.sass
rename to fixtures/test-app/source/stylesheets/site.css.sass
diff --git a/fixtures/test-app/views/stylesheets/site_scss.css.scss b/fixtures/test-app/source/stylesheets/site_scss.css.scss
similarity index 100%
rename from fixtures/test-app/views/stylesheets/site_scss.css.scss
rename to fixtures/test-app/source/stylesheets/site_scss.css.scss
diff --git a/fixtures/test-app/public/stylesheets/static.css b/fixtures/test-app/source/stylesheets/static.css
similarity index 100%
rename from fixtures/test-app/public/stylesheets/static.css
rename to fixtures/test-app/source/stylesheets/static.css
diff --git a/fixtures/test-app/public/stylesheets/sub1/auto-css.css b/fixtures/test-app/source/stylesheets/sub1/auto-css.css
similarity index 100%
rename from fixtures/test-app/public/stylesheets/sub1/auto-css.css
rename to fixtures/test-app/source/stylesheets/sub1/auto-css.css
diff --git a/fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css b/fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
similarity index 100%
rename from fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css
rename to fixtures/test-app/source/stylesheets/sub1/sub2/auto-css.css
diff --git a/fixtures/test-app/views/tiny_src.html.haml b/fixtures/test-app/source/tiny_src.html.haml
similarity index 100%
rename from fixtures/test-app/views/tiny_src.html.haml
rename to fixtures/test-app/source/tiny_src.html.haml
diff --git a/lib/middleman/builder.rb b/lib/middleman/builder.rb
index 8dee3656..46306a50 100644
--- a/lib/middleman/builder.rb
+++ b/lib/middleman/builder.rb
@@ -8,7 +8,7 @@ module Middleman
     def tilt_template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
-
+      
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 
@@ -33,6 +33,7 @@ module Middleman
       super
       
       Middleman::Server.new
+      
       if options.has_key?("relative") && options["relative"]
         Middleman::Server.activate :relative_assets
       end
@@ -41,17 +42,12 @@ module Middleman
     
     def source_paths
       @source_paths ||= [
-        Middleman::Server.public,
-        Middleman::Server.views
+        Middleman::Server.root
       ]
     end
     
-    def build_static_files
-      action Directory.new(self, Middleman::Server.public, :public, Middleman::Server.build_dir, { :force => true })
-    end
-    
-    def build_dynamic_files
-      action Directory.new(self, Middleman::Server.views, :dynamic, Middleman::Server.build_dir, { :force => true })
+    def build_all_files
+      action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir, { :force => true })
     end
     
     @@hooks = {}
@@ -69,8 +65,7 @@ module Middleman
   class Directory < ::Thor::Actions::EmptyDirectory
     attr_reader :source
 
-    def initialize(base, source, mode, destination=nil, config={}, &block)
-      @mode = mode
+    def initialize(base, source, destination=nil, config={}, &block)
       @source = File.expand_path(base.find_in_source_paths(source.to_s))
       @block  = block
       super(base, destination, { :recursive => true }.merge(config))
@@ -96,22 +91,20 @@ module Middleman
         end
         
         next if file_source.include?('layout')
+        
+        # Skip partials prefixed with an underscore
         next unless file_source.split('/').select { |p| p[0,1] == '_' }.empty?
-      
+        
         file_extension = File.extname(file_source)
         file_destination = File.join(given_destination, file_source.gsub(source, '.'))
         file_destination.gsub!('/./', '/')
-      
-        handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
-        if handled_by_tilt || (file_extension == ".js")
-          new_file_extension = (file_extension == ".js") ? ".js" : ""
-          next if @mode == :dynamic && file_source.split('/').last.split('.').length < 3
         
-          file_destination.gsub!(file_extension, new_file_extension)
-          destination = base.tilt_template(file_source, file_destination, config, &@block)
-        else  
-          destination = base.copy_file(file_source, file_destination, config, &@block)
+        handled_by_tilt = ::Tilt.mappings.has_key?(file_extension.gsub(/^\./, ""))
+        if handled_by_tilt
+          file_destination.gsub!(file_extension, "")
         end
+        
+        destination = base.tilt_template(file_source, file_destination, config, &@block)
       end
     end
 
diff --git a/lib/middleman/server.rb b/lib/middleman/server.rb
index 7df9e309..96b97c25 100644
--- a/lib/middleman/server.rb
+++ b/lib/middleman/server.rb
@@ -15,8 +15,6 @@ module Middleman
     set :logging,     false
     set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
     
-    # Import padrino helper methods
-    
     # Middleman-specific options
     set :index_file,  "index.html"  # What file responds to folder requests
                                     # Such as the homepage (/) or subfolders (/about/)
@@ -30,9 +28,14 @@ module Middleman
     set :build_dir,   "build"       # Which folder are builds output to
     set :http_prefix, nil           # During build, add a prefix for absolute paths
     
+    set :static, false
+    set :views, "source"
+    
+    # Disable Padrino cache buster until explicitly enabled
+    set :asset_stamp, false
+    
     # Use Padrino Helpers
     register Padrino::Helpers
-    set :asset_stamp, false         # Disable Padrino cache buster until explicitly enabled
     
     # Activate custom features
     register Middleman::Features
@@ -140,11 +143,12 @@ module Middleman
       # Normalize the path and add index if we're looking at a directory
       path = self.class.path_to_index(request.path)
       
-      static_path = File.join(Middleman::Server.public, path)
-      # if File.exists? static_path
-      #   send_file static_path
-      #   return
-      # end
+      extensionless_path, template_engine = resolve_template(path)
+      
+      if !::Tilt.mappings.has_key?(template_engine.to_s)
+        send_file File.join(Middleman::Server.views, path)
+        return
+      end
       
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
@@ -182,9 +186,6 @@ class Middleman::Server
       Middleman::Server.class_eval File.read(local_config)
       set :app_file, File.expand_path(local_config)
     end
-      
-    use ::Rack::ConditionalGet
-    use ::Rack::Static, :urls => ["/#{self.images_dir}"], :root => "public"
     
     @@run_after_features.each { |block| class_eval(&block) }
     
diff --git a/lib/middleman/templates/default.rb b/lib/middleman/templates/default.rb
index f6b6dc2b..5ce9557d 100644
--- a/lib/middleman/templates/default.rb
+++ b/lib/middleman/templates/default.rb
@@ -6,10 +6,10 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   def build_scaffold
     template "config.tt", File.join(location, "config.rb")
     template "config.ru", File.join(location, "config.ru")
-    directory "views", File.join(location, "views")
-    empty_directory File.join(location, "public", options[:css_dir])
-    empty_directory File.join(location, "public", options[:js_dir])
-    empty_directory File.join(location, "public", options[:images_dir])
+    directory "source", File.join(location, "source")
+    empty_directory File.join(location, "source", options[:css_dir])
+    empty_directory File.join(location, "source", options[:js_dir])
+    empty_directory File.join(location, "source", options[:images_dir])
   end  
 end
 
diff --git a/lib/middleman/templates/default/views/index.html.haml b/lib/middleman/templates/default/source/index.html.haml
similarity index 100%
rename from lib/middleman/templates/default/views/index.html.haml
rename to lib/middleman/templates/default/source/index.html.haml
diff --git a/lib/middleman/templates/default/views/layout.haml b/lib/middleman/templates/default/source/layout.haml
similarity index 100%
rename from lib/middleman/templates/default/views/layout.haml
rename to lib/middleman/templates/default/source/layout.haml
diff --git a/lib/middleman/templates/default/views/stylesheets/site.css.sass b/lib/middleman/templates/default/source/stylesheets/site.css.sass
similarity index 100%
rename from lib/middleman/templates/default/views/stylesheets/site.css.sass
rename to lib/middleman/templates/default/source/stylesheets/site.css.sass
diff --git a/lib/middleman/templates/html5.rb b/lib/middleman/templates/html5.rb
index 0b5eea24..7eaab30a 100644
--- a/lib/middleman/templates/html5.rb
+++ b/lib/middleman/templates/html5.rb
@@ -5,8 +5,8 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
   
   def build_scaffold
     template "config.tt", File.join(location, "config.rb")
-    directory "public", File.join(location, "public")
-    empty_directory File.join(location, "views")
+    directory "source", File.join(location, "source")
+    empty_directory File.join(location, "source")
   end
 end
 
diff --git a/lib/middleman/templates/html5/public/404.html b/lib/middleman/templates/html5/source/404.html
similarity index 100%
rename from lib/middleman/templates/html5/public/404.html
rename to lib/middleman/templates/html5/source/404.html
diff --git a/lib/middleman/templates/html5/public/apple-touch-icon.png b/lib/middleman/templates/html5/source/apple-touch-icon.png
similarity index 100%
rename from lib/middleman/templates/html5/public/apple-touch-icon.png
rename to lib/middleman/templates/html5/source/apple-touch-icon.png
diff --git a/lib/middleman/templates/html5/public/crossdomain.xml b/lib/middleman/templates/html5/source/crossdomain.xml
similarity index 100%
rename from lib/middleman/templates/html5/public/crossdomain.xml
rename to lib/middleman/templates/html5/source/crossdomain.xml
diff --git a/lib/middleman/templates/html5/public/css/handheld.css b/lib/middleman/templates/html5/source/css/handheld.css
similarity index 100%
rename from lib/middleman/templates/html5/public/css/handheld.css
rename to lib/middleman/templates/html5/source/css/handheld.css
diff --git a/lib/middleman/templates/html5/public/css/style.css b/lib/middleman/templates/html5/source/css/style.css
similarity index 100%
rename from lib/middleman/templates/html5/public/css/style.css
rename to lib/middleman/templates/html5/source/css/style.css
diff --git a/lib/middleman/templates/html5/public/favicon.ico b/lib/middleman/templates/html5/source/favicon.ico
similarity index 100%
rename from lib/middleman/templates/html5/public/favicon.ico
rename to lib/middleman/templates/html5/source/favicon.ico
diff --git a/lib/middleman/templates/html5/public/humans.txt b/lib/middleman/templates/html5/source/humans.txt
similarity index 100%
rename from lib/middleman/templates/html5/public/humans.txt
rename to lib/middleman/templates/html5/source/humans.txt
diff --git a/lib/middleman/templates/html5/public/images/.gitignore b/lib/middleman/templates/html5/source/images/.gitignore
similarity index 100%
rename from lib/middleman/templates/html5/public/images/.gitignore
rename to lib/middleman/templates/html5/source/images/.gitignore
diff --git a/lib/middleman/templates/html5/public/index.html b/lib/middleman/templates/html5/source/index.html
similarity index 100%
rename from lib/middleman/templates/html5/public/index.html
rename to lib/middleman/templates/html5/source/index.html
diff --git a/lib/middleman/templates/html5/public/js/libs/dd_belatedpng.js b/lib/middleman/templates/html5/source/js/libs/dd_belatedpng.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/libs/dd_belatedpng.js
rename to lib/middleman/templates/html5/source/js/libs/dd_belatedpng.js
diff --git a/lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.js b/lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.js
rename to lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.js
diff --git a/lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.min.js b/lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.min.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.min.js
rename to lib/middleman/templates/html5/source/js/libs/jquery-1.5.0.min.js
diff --git a/lib/middleman/templates/html5/public/js/libs/modernizr-1.6.min.js b/lib/middleman/templates/html5/source/js/libs/modernizr-1.6.min.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/libs/modernizr-1.6.min.js
rename to lib/middleman/templates/html5/source/js/libs/modernizr-1.6.min.js
diff --git a/lib/middleman/templates/html5/public/js/mylibs/.gitignore b/lib/middleman/templates/html5/source/js/mylibs/.gitignore
similarity index 100%
rename from lib/middleman/templates/html5/public/js/mylibs/.gitignore
rename to lib/middleman/templates/html5/source/js/mylibs/.gitignore
diff --git a/lib/middleman/templates/html5/public/js/plugins.js b/lib/middleman/templates/html5/source/js/plugins.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/plugins.js
rename to lib/middleman/templates/html5/source/js/plugins.js
diff --git a/lib/middleman/templates/html5/public/js/script.js b/lib/middleman/templates/html5/source/js/script.js
similarity index 100%
rename from lib/middleman/templates/html5/public/js/script.js
rename to lib/middleman/templates/html5/source/js/script.js
diff --git a/lib/middleman/templates/html5/public/robots.txt b/lib/middleman/templates/html5/source/robots.txt
similarity index 100%
rename from lib/middleman/templates/html5/public/robots.txt
rename to lib/middleman/templates/html5/source/robots.txt
diff --git a/lib/middleman/templates/xhtml.rb b/lib/middleman/templates/xhtml.rb
index 1e3514ec..04d97770 100644
--- a/lib/middleman/templates/xhtml.rb
+++ b/lib/middleman/templates/xhtml.rb
@@ -6,10 +6,10 @@ class Middleman::Templates::Xhtml < Middleman::Templates::Base
   def build_scaffold
     template "config.tt", File.join(location, "config.rb")
     template "config.ru", File.join(location, "config.ru")
-    directory "views", File.join(location, "views")
-    empty_directory File.join(location, "public", options[:css_dir])
-    empty_directory File.join(location, "public", options[:js_dir])
-    empty_directory File.join(location, "public", options[:images_dir])
+    directory "source", File.join(location, "source")
+    empty_directory File.join(location, "source", options[:css_dir])
+    empty_directory File.join(location, "source", options[:js_dir])
+    empty_directory File.join(location, "source", options[:images_dir])
   end  
 end
 
diff --git a/lib/middleman/templates/xhtml/views/index.html.haml b/lib/middleman/templates/xhtml/source/index.html.haml
similarity index 100%
rename from lib/middleman/templates/xhtml/views/index.html.haml
rename to lib/middleman/templates/xhtml/source/index.html.haml
diff --git a/lib/middleman/templates/xhtml/views/layout.haml b/lib/middleman/templates/xhtml/source/layout.haml
similarity index 100%
rename from lib/middleman/templates/xhtml/views/layout.haml
rename to lib/middleman/templates/xhtml/source/layout.haml
diff --git a/lib/middleman/templates/xhtml/views/stylesheets/site.css.sass b/lib/middleman/templates/xhtml/source/stylesheets/site.css.sass
similarity index 100%
rename from lib/middleman/templates/xhtml/views/stylesheets/site.css.sass
rename to lib/middleman/templates/xhtml/source/stylesheets/site.css.sass
diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb
index 6dfb7cef..87b96428 100644
--- a/lib/middleman/version.rb
+++ b/lib/middleman/version.rb
@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.2.7"
+  VERSION = "2.0.0.beta1"
 end