diff --git a/Gemfile b/Gemfile
index a8d312dc..13ba8238 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,16 @@
 source :rubygems
- 
-gemspec :name => "middleman"
\ No newline at end of file
+
+group :development do
+  gem "cucumber", "~> 1.1.0"
+  gem "aruba",    "~> 0.4.11"
+  gem "rake",     "~> 0.9.2"
+  gem "rspec",    "~> 2.7"
+  gem "rdoc",     "~> 3.9"
+  gem "yard"
+  
+  # For actual tests
+  gem "sinatra"
+end
+
+gem "middleman-core", :path => "middleman-core"
+# gem "middleman-more", :path => "middleman-more"
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 0be3d96c..448f328b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,17 +1,7 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks :name => ENV["NAME"] || "middleman"
+ROOT = File.expand_path(File.dirname(__FILE__))
 
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
-end
-
-require 'rake/clean'
-
-task :test => ["cucumber"]
-
-desc "Build HTML documentation"
-task :doc do
-  sh 'bundle exec yard'
-end
+task :test do
+  ["middleman-core"].each do |g|
+    sh "cd #{File.join(ROOT, g)} && bundle exec rake test"
+  end
+end
\ No newline at end of file
diff --git a/features/support/env.rb b/features/support/env.rb
deleted file mode 100644
index 587dd388..00000000
--- a/features/support/env.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman')
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman', 'step_definitions')
\ No newline at end of file
diff --git a/fixtures/chained-app/source/index.html.markdown.erb b/fixtures/chained-app/source/index.html.markdown.erb
deleted file mode 100755
index 17a0f29a..00000000
--- a/fixtures/chained-app/source/index.html.markdown.erb
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: false
-sup: "Sup"
----
-
-# <%= data.article.title %>
-## <%= data.article.subtitle %>
-### <%= data.page.sup %>
\ No newline at end of file
diff --git a/fixtures/clean-app/source/index.html.haml b/fixtures/clean-app/source/index.html.haml
deleted file mode 100755
index be6c2513..00000000
--- a/fixtures/clean-app/source/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-h1 Welcome
\ No newline at end of file
diff --git a/fixtures/clean-dir-app/config.rb b/fixtures/clean-dir-app/config.rb
deleted file mode 100644
index 2cc4c97d..00000000
--- a/fixtures/clean-dir-app/config.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-
-activate :directory_indexes
diff --git a/fixtures/clean-dir-app/source/about.html b/fixtures/clean-dir-app/source/about.html
deleted file mode 100644
index ae84f243..00000000
--- a/fixtures/clean-dir-app/source/about.html
+++ /dev/null
@@ -1 +0,0 @@
-Fun times
diff --git a/fixtures/custom-layout-app/config.rb b/fixtures/custom-layout-app/config.rb
deleted file mode 100644
index 93b5f327..00000000
--- a/fixtures/custom-layout-app/config.rb
+++ /dev/null
@@ -1 +0,0 @@
-set :erb, :layout_engine => :haml
\ No newline at end of file
diff --git a/fixtures/custom-layout-app/source/layout.haml b/fixtures/custom-layout-app/source/layout.haml
deleted file mode 100644
index e5a7a094..00000000
--- a/fixtures/custom-layout-app/source/layout.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%html
-  %head
-    %title My Sample Site
-    / Comment in layout
-  %body
-    = yield
\ No newline at end of file
diff --git a/fixtures/data-app/source/layout.haml b/fixtures/data-app/source/layout.haml
deleted file mode 100644
index e34689e1..00000000
--- a/fixtures/data-app/source/layout.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%html
-  %body
-    = yield
\ No newline at end of file
diff --git a/fixtures/different-engine-layout/source/index.html.haml b/fixtures/different-engine-layout/source/index.html.haml
deleted file mode 100755
index 0582dd93..00000000
--- a/fixtures/different-engine-layout/source/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Welcome
\ No newline at end of file
diff --git a/fixtures/different-engine-partial/source/shared/_footer.slim b/fixtures/different-engine-partial/source/shared/_footer.slim
deleted file mode 100644
index f80deb9e..00000000
--- a/fixtures/different-engine-partial/source/shared/_footer.slim
+++ /dev/null
@@ -1 +0,0 @@
-footer Slim Footer
\ No newline at end of file
diff --git a/fixtures/glob-app/source/index.html.haml b/fixtures/glob-app/source/index.html.haml
deleted file mode 100755
index 6ef080c6..00000000
--- a/fixtures/glob-app/source/index.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%h1 Welcome
-
-:markdown
-  ## H2
-  
-  Paragraph
\ No newline at end of file
diff --git a/fixtures/multiple-layouts/source/layout.haml b/fixtures/multiple-layouts/source/layout.haml
deleted file mode 100644
index 771157f0..00000000
--- a/fixtures/multiple-layouts/source/layout.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%html
-  %head
-    %title My Sample Site
-    / Haml Comment in layout
-  %body
-    = yield
\ No newline at end of file
diff --git a/fixtures/partials-app/source/_main.haml b/fixtures/partials-app/source/_main.haml
deleted file mode 100644
index 0dde75aa..00000000
--- a/fixtures/partials-app/source/_main.haml
+++ /dev/null
@@ -1 +0,0 @@
-Haml Main
\ No newline at end of file
diff --git a/fixtures/partials-app/source/second.html.haml b/fixtures/partials-app/source/second.html.haml
deleted file mode 100755
index f6e15653..00000000
--- a/fixtures/partials-app/source/second.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-= partial "shared/header"
-= partial "main"
-= partial "shared/footer"
\ No newline at end of file
diff --git a/fixtures/test-app/source/custom-layout-dir/index.html.haml b/fixtures/test-app/source/custom-layout-dir/index.html.haml
deleted file mode 100755
index 0582dd93..00000000
--- a/fixtures/test-app/source/custom-layout-dir/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Welcome
\ No newline at end of file
diff --git a/fixtures/test-app/source/layout.haml b/fixtures/test-app/source/layout.haml
deleted file mode 100644
index e5a7a094..00000000
--- a/fixtures/test-app/source/layout.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%html
-  %head
-    %title My Sample Site
-    / Comment in layout
-  %body
-    = yield
\ No newline at end of file
diff --git a/fixtures/test-app/source/layouts/custom.haml b/fixtures/test-app/source/layouts/custom.haml
deleted file mode 100755
index 87de0ed3..00000000
--- a/fixtures/test-app/source/layouts/custom.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%html
-  %head
-    %title Custom Layout
-  %body
-    = yield
\ No newline at end of file
diff --git a/fixtures/test-app/source/stylesheets/site.css.sass b/fixtures/test-app/source/stylesheets/site.css.sass
deleted file mode 100755
index d143e05e..00000000
--- a/fixtures/test-app/source/stylesheets/site.css.sass
+++ /dev/null
@@ -1 +0,0 @@
-@import "compass/reset"
\ No newline at end of file
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
new file mode 100644
index 00000000..293010ef
--- /dev/null
+++ b/gem_rake_helper.rb
@@ -0,0 +1,23 @@
+require 'rubygems' unless defined?(Gem)
+require 'rake'
+require 'cucumber/rake/task'
+require 'bundler/gem_tasks'
+require 'yard'
+
+# Skip the releasing tag
+# class Bundler::GemHelper
+#   def release_gem
+#     guard_clean
+#     guard_already_tagged
+#     built_gem_path = build_gem
+#     rubygem_push(built_gem_path)
+#   end
+# end
+
+Cucumber::Rake::Task.new(:test, 'Run features that should pass') do |t|
+  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+end
+
+YARD::Rake::YardocTask.new
+
+task :default => :test
\ No newline at end of file
diff --git a/lib/middleman/templates/shared/Gemfile.tt b/lib/middleman/templates/shared/Gemfile.tt
deleted file mode 100644
index 84520bad..00000000
--- a/lib/middleman/templates/shared/Gemfile.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gem "middleman", "~><%= Middleman::VERSION %>"
\ No newline at end of file
diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb
deleted file mode 100644
index c566f22d..00000000
--- a/lib/middleman/version.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Using for version parsing
-require "rubygems"
-
-module Middleman
-  # Current Version
-  # @return [String]
-  VERSION = "3.0.0.alpha.6"
-  
-  # Parsed version for RubyGems
-  # @private
-  # @return [String]
-  GEM_VERSION = ::Gem::Version.create(VERSION)
-end
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/Rakefile b/middleman-core/Rakefile
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/Rakefile
rename to middleman-core/Rakefile
diff --git a/bin/middleman b/middleman-core/bin/middleman
similarity index 97%
rename from bin/middleman
rename to middleman-core/bin/middleman
index e036e26e..fa92b65d 100755
--- a/bin/middleman
+++ b/middleman-core/bin/middleman
@@ -34,7 +34,7 @@ end
 ARGV << "server" if ARGV.length < 1
 
 # Require Middleman
-require 'middleman'
+require 'middleman-core'
 
 # Change directory to the root
 Dir.chdir(ENV["MM_ROOT"] || Dir.pwd) do
diff --git a/features/3rd_party_cli.feature b/middleman-core/features/3rd_party_cli.feature
similarity index 100%
rename from features/3rd_party_cli.feature
rename to middleman-core/features/3rd_party_cli.feature
diff --git a/features/auto_layout.feature b/middleman-core/features/auto_layout.feature
similarity index 95%
rename from features/auto_layout.feature
rename to middleman-core/features/auto_layout.feature
index 444983ee..e57edb82 100644
--- a/features/auto_layout.feature
+++ b/middleman-core/features/auto_layout.feature
@@ -33,5 +33,4 @@ Feature: Provide Sane Defaults for Layout Behavior
   Scenario: Overwrite manual layout
     Given the Server is running at "manual-layout-override"
     When I go to "/index.html"
-    Then I should see "Another Comment in layout"
-    
\ No newline at end of file
+    Then I should see "Another Comment in layout"
\ No newline at end of file
diff --git a/features/builder.feature b/middleman-core/features/builder.feature
similarity index 78%
rename from features/builder.feature
rename to middleman-core/features/builder.feature
index 1d4a8a02..2bc6dc62 100644
--- a/features/builder.feature
+++ b/middleman-core/features/builder.feature
@@ -2,15 +2,12 @@ Feature: Builder
   In order to output static html and css for delivery
 
   Scenario: Checking built folder for content
-    Given a successfully built app at "test-app"
+    Given a successfully built app at "large-build-app"
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-      | javascripts/coffee_test.js                    |
       | static.html                                   |
       | services/index.html                           |
-      | stylesheets/site.css                          |
-      | stylesheets/site_scss.css                     |
       | stylesheets/static.css                        |
       | spaces in file.html                           |
       | images/blank.gif                              |
@@ -19,7 +16,6 @@ Feature: Builder
       | .htaccess                                     |
     Then the following files should not exist:
       | _partial                                      |
-      | _liquid_partial                               |
       | layout                                        |
       | other_layout                                  |
       | layouts/custom                                |
@@ -27,11 +23,8 @@ Feature: Builder
       
     And the file "index.html" should contain "Comment in layout"
     And the file "index.html" should contain "<h1>Welcome</h1>"
-    And the file "javascripts/coffee_test.js" should contain "Array.prototype.slice"
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
-    And the file "stylesheets/site.css" should contain "html, body, div, span"
-    And the file "stylesheets/site_scss.css" should contain "html, body, div, span"
     And the file "stylesheets/static.css" should contain "body"
     And the file "spaces in file.html" should contain "spaces"
     
@@ -52,6 +45,6 @@ Feature: Builder
     Then the exit status should be 1
 
   Scenario: Build alias (b)
-    Given a fixture app "test-app"
+    Given a fixture app "large-build-app"
     When I run `middleman b`
     Then was successfully built
\ No newline at end of file
diff --git a/features/chained_templates.feature b/middleman-core/features/chained_templates.feature
similarity index 100%
rename from features/chained_templates.feature
rename to middleman-core/features/chained_templates.feature
diff --git a/features/clean_build.feature b/middleman-core/features/clean_build.feature
similarity index 100%
rename from features/clean_build.feature
rename to middleman-core/features/clean_build.feature
diff --git a/features/cli.feature b/middleman-core/features/cli.feature
similarity index 100%
rename from features/cli.feature
rename to middleman-core/features/cli.feature
diff --git a/middleman-core/features/content_for.feature b/middleman-core/features/content_for.feature
new file mode 100644
index 00000000..06207e94
--- /dev/null
+++ b/middleman-core/features/content_for.feature
@@ -0,0 +1,6 @@
+Feature: Support content_for and yield_content helpers
+
+  Scenario: content_for works as expected in erb
+    Given the Server is running at "content-for-app"
+    When I go to "/content_for_erb.html"
+    Then I should see "In Layout: I am the yielded content erb"
\ No newline at end of file
diff --git a/features/current_page_request_path_backwards.feature b/middleman-core/features/current_page_request_path_backwards.feature
similarity index 75%
rename from features/current_page_request_path_backwards.feature
rename to middleman-core/features/current_page_request_path_backwards.feature
index 05040c2a..41853e75 100644
--- a/features/current_page_request_path_backwards.feature
+++ b/middleman-core/features/current_page_request_path_backwards.feature
@@ -1,6 +1,6 @@
 Feature: Support old request.path object used by many extensions
   
   Scenario: Viewing the root path
-    Given the Server is running at "test-app"
+    Given the Server is running at "current-page-app"
     When I go to "/request-path.html"
     Then I should see "true"
\ No newline at end of file
diff --git a/features/custom_layout_engines.feature b/middleman-core/features/custom_layout_engines.feature
similarity index 66%
rename from features/custom_layout_engines.feature
rename to middleman-core/features/custom_layout_engines.feature
index 4d0a5618..1af78a3d 100644
--- a/features/custom_layout_engines.feature
+++ b/middleman-core/features/custom_layout_engines.feature
@@ -5,9 +5,4 @@ Feature: Custom Layout Engine
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-    And the file "index.html" should contain "Comment in layout"
-    
-  Scenario: Checking server for content
-    Given the Server is running at "test-app"
-    When I go to "/index.html"
-    Then I should see "Comment in layout"
\ No newline at end of file
+    And the file "index.html" should contain "Comment in layout"
\ No newline at end of file
diff --git a/features/page_alias_and_layouts.feature b/middleman-core/features/custom_layouts.feature
similarity index 85%
rename from features/page_alias_and_layouts.feature
rename to middleman-core/features/custom_layouts.feature
index b3ff6fb7..afeb7a41 100644
--- a/features/page_alias_and_layouts.feature
+++ b/middleman-core/features/custom_layouts.feature
@@ -3,19 +3,19 @@ Feature: Custom layouts
   
   Scenario: Using custom :layout attribute
     Given page "/custom-layout.html" has layout "custom"
-    And the Server is running at "test-app"
+    And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
     
   Scenario: Using with_layout block
     Given "/custom-layout.html" with_layout block has layout "custom"
-    And the Server is running at "test-app"
+    And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir/" has layout "custom"
-    And the Server is running at "test-app"
+    And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -25,7 +25,7 @@ Feature: Custom layouts
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir" has layout "custom"
-    And the Server is running at "test-app"
+    And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -35,7 +35,7 @@ Feature: Custom layouts
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir/index.html" has layout "custom"
-    And the Server is running at "test-app"
+    And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
diff --git a/features/data.feature b/middleman-core/features/data.feature
similarity index 68%
rename from features/data.feature
rename to middleman-core/features/data.feature
index 9c1394c3..1d086216 100644
--- a/features/data.feature
+++ b/middleman-core/features/data.feature
@@ -2,19 +2,19 @@ Feature: Local Data API
   In order to abstract content from structure
 
   Scenario: Rendering html
-    Given the Server is running at "test-app"
+    Given the Server is running at "basic-data-app"
     When I go to "/data.html"
     Then I should see "One:Two"
   
   Scenario: Rendering json
-    Given the Server is running at "test-app"
+    Given the Server is running at "basic-data-app"
     When I go to "/data3.html"
     Then I should see "One:Two"
   
-  Scenario: Rendering liquid
-    Given the Server is running at "test-app"
-    When I go to "/data2.html"
-    Then I should see "OneTwo"
+  # Scenario: Rendering liquid
+  #   Given the Server is running at "basic-data-app"
+  #   When I go to "/data2.html"
+  #   Then I should see "OneTwo"
     
   Scenario: Using data in config.rb
     Given the Server is running at "data-app"
diff --git a/features/directory_index.feature b/middleman-core/features/directory_index.feature
similarity index 100%
rename from features/directory_index.feature
rename to middleman-core/features/directory_index.feature
diff --git a/features/dynamic_pages.feature b/middleman-core/features/dynamic_pages.feature
similarity index 91%
rename from features/dynamic_pages.feature
rename to middleman-core/features/dynamic_pages.feature
index d20c9a26..956a8fcf 100644
--- a/features/dynamic_pages.feature
+++ b/middleman-core/features/dynamic_pages.feature
@@ -2,7 +2,7 @@ Feature: Dynamic Pages
   In order to use a single view to generate multiple output files
 
   Scenario: Checking built folder for content
-    Given a successfully built app at "test-app"
+    Given a successfully built app at "dynamic-pages-app"
     When I cd to "build"
     Then the following files should exist:
       | fake.html                                     |
@@ -32,7 +32,7 @@ Feature: Dynamic Pages
       | should_be_ignored8.html                       |
     
   Scenario: Preview basic proxy
-    Given the Server is running at "test-app"
+    Given the Server is running at "dynamic-pages-app"
     When I go to "/fake.html"
     Then I should see "I am real"
     When I go to "/fake2.html"
@@ -43,7 +43,7 @@ Feature: Dynamic Pages
     Then I should see "I am real"
     
   Scenario: Preview proxy with variable one
-    Given the Server is running at "test-app"
+    Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
     When I go to "/fake2/one.html"
@@ -54,7 +54,7 @@ Feature: Dynamic Pages
     Then I should see "I am real: one"
     
   Scenario: Preview proxy with variable two
-    Given the Server is running at "test-app"
+    Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/two.html"
     Then I should see "I am real: two"
     When I go to "/fake2/two.html"
@@ -65,7 +65,7 @@ Feature: Dynamic Pages
     Then I should see "I am real: two"
     
   Scenario: Target ignore
-    Given the Server is running at "test-app"
+    Given the Server is running at "dynamic-pages-app"
     When I go to "/target_ignore.html"
     Then I should see "Ignore me! 3"
     When I go to "/target_ignore2.html"
@@ -76,7 +76,7 @@ Feature: Dynamic Pages
     Then I should see "Ignore me! 8"
     
   Scenario: Preview ignored paths
-    Given the Server is running at "test-app"
+    Given the Server is running at "dynamic-pages-app"
     When I go to "/should_be_ignored.html"
     Then I should see "File Not Found"
     When I go to "/should_be_ignored2.html"
diff --git a/features/feature_params.feature b/middleman-core/features/feature_params.feature
similarity index 100%
rename from features/feature_params.feature
rename to middleman-core/features/feature_params.feature
diff --git a/features/former_padrino_helpers.feature b/middleman-core/features/former_padrino_helpers.feature
similarity index 86%
rename from features/former_padrino_helpers.feature
rename to middleman-core/features/former_padrino_helpers.feature
index 79489d2b..66f790b0 100644
--- a/features/former_padrino_helpers.feature
+++ b/middleman-core/features/former_padrino_helpers.feature
@@ -2,7 +2,7 @@ Feature: Built-in macro view helpers
   In order to simplify generating HTML
 
   Scenario: Using the link_to helper
-    Given the Server is running at "test-app"
+    Given the Server is running at "padrino-helpers-app"
     When I go to "/former_padrino_test.html"
     And I should see 'href="test2.com"'
     And I should see 'src="/images/test2.png"'
diff --git a/features/front-matter.feature b/middleman-core/features/front-matter.feature
similarity index 90%
rename from features/front-matter.feature
rename to middleman-core/features/front-matter.feature
index 0821b50f..f7fd0042 100644
--- a/features/front-matter.feature
+++ b/middleman-core/features/front-matter.feature
@@ -2,7 +2,7 @@ Feature: YAML Front Matter
   In order to specific options and data inline
 
   Scenario: Rendering html
-    Given the Server is running at "test-app"
+    Given the Server is running at "frontmatter-app"
     When I go to "/front-matter.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see "---"
@@ -12,7 +12,7 @@ Feature: YAML Front Matter
     Then I should not see "---"
 
   Scenario: A template changes frontmatter during preview
-    Given the Server is running at "test-app"
+    Given the Server is running at "frontmatter-app"
     And the file "source/front-matter-change.html.erb" has the contents
       """
       ---
diff --git a/features/helpers_auto_javascript_include_tag.feature b/middleman-core/features/helpers_auto_javascript_include_tag.feature
similarity index 77%
rename from features/helpers_auto_javascript_include_tag.feature
rename to middleman-core/features/helpers_auto_javascript_include_tag.feature
index 2d9b7f0e..b4464546 100644
--- a/features/helpers_auto_javascript_include_tag.feature
+++ b/middleman-core/features/helpers_auto_javascript_include_tag.feature
@@ -2,26 +2,26 @@ Feature: Built-in auto_javascript_include_tag view helper
   In order to simplify including javascript files
 
   Scenario: Viewing the root path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-js-app"
     When I go to "/auto-js.html"
     Then I should see "javascripts/auto-js.js"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-js-app"
     When I go to "/auto-js/auto-js.html"
     Then I should see "javascripts/auto-js/auto-js.js"
 
   Scenario: Viewing the index file of a tier-1 path, without filename
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-js-app"
     When I go to "/auto-js"
     Then I should see "javascripts/auto-js/index.js"
 
   Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-js-app"
     When I go to "/auto-js/"
     Then I should see "javascripts/auto-js/index.js"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-js-app"
     When I go to "/auto-js/sub/auto-js.html"
     Then I should see "javascripts/auto-js/sub/auto-js.js"
diff --git a/features/helpers_auto_stylesheet_link_tag.feature b/middleman-core/features/helpers_auto_stylesheet_link_tag.feature
similarity index 76%
rename from features/helpers_auto_stylesheet_link_tag.feature
rename to middleman-core/features/helpers_auto_stylesheet_link_tag.feature
index c6d64973..b9301b21 100644
--- a/features/helpers_auto_stylesheet_link_tag.feature
+++ b/middleman-core/features/helpers_auto_stylesheet_link_tag.feature
@@ -2,26 +2,26 @@ Feature: Built-in auto_stylesheet_link_tag view helper
   In order to simplify including css files
 
   Scenario: Viewing the root path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-css-app"
     When I go to "/auto-css.html"
     Then I should see "stylesheets/auto-css.css"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-css-app"
     When I go to "/auto-css/auto-css.html"
     Then I should see "stylesheets/auto-css/auto-css.css"
 
   Scenario: Viewing the index file of a tier-1 path, without filename
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-css-app"
     When I go to "/auto-css"
     Then I should see "stylesheets/auto-css/index.css"
 
   Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-css-app"
     When I go to "/auto-css/"
     Then I should see "stylesheets/auto-css/index.css"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "auto-css-app"
     When I go to "/auto-css/sub/auto-css.html"
     Then I should see "stylesheets/auto-css/sub/auto-css.css"
diff --git a/features/helpers_external.feature b/middleman-core/features/helpers_external.feature
similarity index 100%
rename from features/helpers_external.feature
rename to middleman-core/features/helpers_external.feature
diff --git a/features/helpers_lorem.feature b/middleman-core/features/helpers_lorem.feature
similarity index 78%
rename from features/helpers_lorem.feature
rename to middleman-core/features/helpers_lorem.feature
index 31995796..767b3e6d 100644
--- a/features/helpers_lorem.feature
+++ b/middleman-core/features/helpers_lorem.feature
@@ -1,6 +1,6 @@
 Feature: Lorem generating helper
 
   Scenario: Lorem Helper
-    Given the Server is running at "test-app"
+    Given the Server is running at "lorem-app"
     Then going to "/lorem.html" should not raise an exception
     And I should see "http://placekitten.com/100"
\ No newline at end of file
diff --git a/features/helpers_page_classes.feature b/middleman-core/features/helpers_page_classes.feature
similarity index 74%
rename from features/helpers_page_classes.feature
rename to middleman-core/features/helpers_page_classes.feature
index c2c874f9..b556d6e9 100644
--- a/features/helpers_page_classes.feature
+++ b/middleman-core/features/helpers_page_classes.feature
@@ -2,16 +2,16 @@ Feature: Built-in page_classes view helper
   In order to generate body classes for views
   
   Scenario: Viewing the root path
-    Given the Server is running at "test-app"
+    Given the Server is running at "page-classes-app"
     When I go to "/page-classes.html"
     Then I should see "page-classes"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "page-classes-app"
     When I go to "/sub1/page-classes.html"
     Then I should see "sub1 sub1_page-classes"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running at "test-app"
+    Given the Server is running at "page-classes-app"
     When I go to "/sub1/sub2/page-classes.html"
     Then I should see "sub1 sub1_sub2 sub1_sub2_page-classes"
\ No newline at end of file
diff --git a/features/instance_vars.feature b/middleman-core/features/instance_vars.feature
similarity index 100%
rename from features/instance_vars.feature
rename to middleman-core/features/instance_vars.feature
diff --git a/features/mount_rack.feature b/middleman-core/features/mount_rack.feature
similarity index 100%
rename from features/mount_rack.feature
rename to middleman-core/features/mount_rack.feature
diff --git a/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature
similarity index 100%
rename from features/nested_layouts.feature
rename to middleman-core/features/nested_layouts.feature
diff --git a/features/partials.feature b/middleman-core/features/partials.feature
similarity index 95%
rename from features/partials.feature
rename to middleman-core/features/partials.feature
index ddceef6b..dfc2950e 100644
--- a/features/partials.feature
+++ b/middleman-core/features/partials.feature
@@ -20,7 +20,7 @@ Feature: Provide Sane Defaults for Partial Behavior
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/second.html"
-    Then I should see "Haml Main"
+    Then I should see "Str Main"
     And I should see "Header"
     And I should see "Footer"
     
@@ -38,4 +38,4 @@ Feature: Provide Sane Defaults for Partial Behavior
     Given the Server is running at "different-engine-partial"
     When I go to "/index.html"
     Then I should see "ERb Header"
-    And I should see "Slim Footer"
+    And I should see "Str Footer"
diff --git a/features/preview_changes.feature b/middleman-core/features/preview_changes.feature
similarity index 100%
rename from features/preview_changes.feature
rename to middleman-core/features/preview_changes.feature
diff --git a/features/sitemap_traversal.features b/middleman-core/features/sitemap_traversal.features
similarity index 100%
rename from features/sitemap_traversal.features
rename to middleman-core/features/sitemap_traversal.features
diff --git a/features/static_server.feature b/middleman-core/features/static_server.feature
similarity index 100%
rename from features/static_server.feature
rename to middleman-core/features/static_server.feature
diff --git a/features/step_definitions/page_layout_steps.rb b/middleman-core/features/step_definitions/page_layout_steps.rb
similarity index 100%
rename from features/step_definitions/page_layout_steps.rb
rename to middleman-core/features/step_definitions/page_layout_steps.rb
diff --git a/middleman-core/features/support/env.rb b/middleman-core/features/support/env.rb
new file mode 100644
index 00000000..a70b307d
--- /dev/null
+++ b/middleman-core/features/support/env.rb
@@ -0,0 +1,3 @@
+PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')
\ No newline at end of file
diff --git a/features/wildcard_page_helper.feature b/middleman-core/features/wildcard_page_helper.feature
similarity index 100%
rename from features/wildcard_page_helper.feature
rename to middleman-core/features/wildcard_page_helper.feature
diff --git a/fixtures/3rd-party-command/config.rb b/middleman-core/fixtures/3rd-party-command/config.rb
similarity index 100%
rename from fixtures/3rd-party-command/config.rb
rename to middleman-core/fixtures/3rd-party-command/config.rb
diff --git a/middleman-core/fixtures/auto-css-app/config.rb b/middleman-core/fixtures/auto-css-app/config.rb
new file mode 100644
index 00000000..eeaf6130
--- /dev/null
+++ b/middleman-core/fixtures/auto-css-app/config.rb
@@ -0,0 +1,11 @@
+with_layout false do
+  %w{
+    /auto-css.html
+    /auto-css
+    /auto-css/
+    /auto-css/auto-css.html
+    /auto-css/sub/auto-css.html
+  }.each do |path|
+    page path
+  end
+end
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css.html.erb
new file mode 100755
index 00000000..fab9e481
--- /dev/null
+++ b/middleman-core/fixtures/auto-css-app/source/auto-css.html.erb
@@ -0,0 +1 @@
+<%= auto_stylesheet_link_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb
new file mode 100755
index 00000000..fab9e481
--- /dev/null
+++ b/middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb
@@ -0,0 +1 @@
+<%= auto_stylesheet_link_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb
new file mode 100755
index 00000000..fab9e481
--- /dev/null
+++ b/middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb
@@ -0,0 +1 @@
+<%= auto_stylesheet_link_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
new file mode 100755
index 00000000..fab9e481
--- /dev/null
+++ b/middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb
@@ -0,0 +1 @@
+<%= auto_stylesheet_link_tag %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/stylesheets/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css
similarity index 100%
rename from fixtures/test-app/source/stylesheets/auto-css.css
rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css
diff --git a/fixtures/test-app/source/stylesheets/auto-css/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
similarity index 100%
rename from fixtures/test-app/source/stylesheets/auto-css/auto-css.css
rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css
diff --git a/fixtures/test-app/source/stylesheets/auto-css/index.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css
similarity index 100%
rename from fixtures/test-app/source/stylesheets/auto-css/index.css
rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css
diff --git a/fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
similarity index 100%
rename from fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css
diff --git a/middleman-core/fixtures/auto-js-app/config.rb b/middleman-core/fixtures/auto-js-app/config.rb
new file mode 100644
index 00000000..92322f50
--- /dev/null
+++ b/middleman-core/fixtures/auto-js-app/config.rb
@@ -0,0 +1,11 @@
+with_layout false do
+  %w{
+    /auto-js.html
+    /auto-js
+    /auto-js/
+    /auto-js/auto-js.html
+    /auto-js/sub/auto-js.html
+  }.each do |path|
+    page path
+  end
+end
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js.html.erb
new file mode 100755
index 00000000..7af247d9
--- /dev/null
+++ b/middleman-core/fixtures/auto-js-app/source/auto-js.html.erb
@@ -0,0 +1 @@
+<%= auto_javascript_include_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb
new file mode 100755
index 00000000..7af247d9
--- /dev/null
+++ b/middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb
@@ -0,0 +1 @@
+<%= auto_javascript_include_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb
new file mode 100755
index 00000000..7af247d9
--- /dev/null
+++ b/middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb
@@ -0,0 +1 @@
+<%= auto_javascript_include_tag %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
new file mode 100755
index 00000000..7af247d9
--- /dev/null
+++ b/middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb
@@ -0,0 +1 @@
+<%= auto_javascript_include_tag %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/javascripts/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/auto-js.js
rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js
diff --git a/fixtures/test-app/source/javascripts/auto-js/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/auto-js/auto-js.js
rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js
diff --git a/fixtures/test-app/source/javascripts/auto-js/index.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/auto-js/index.js
rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js
diff --git a/fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js
rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js
diff --git a/middleman-core/fixtures/basic-data-app/config.rb b/middleman-core/fixtures/basic-data-app/config.rb
new file mode 100644
index 00000000..cb30169b
--- /dev/null
+++ b/middleman-core/fixtures/basic-data-app/config.rb
@@ -0,0 +1,4 @@
+with_layout false do
+  page "/data.html"
+  page "/data3.html"
+end
\ No newline at end of file
diff --git a/fixtures/test-app/data/test.yml b/middleman-core/fixtures/basic-data-app/data/test.yml
similarity index 100%
rename from fixtures/test-app/data/test.yml
rename to middleman-core/fixtures/basic-data-app/data/test.yml
diff --git a/fixtures/test-app/data/test2.json b/middleman-core/fixtures/basic-data-app/data/test2.json
similarity index 100%
rename from fixtures/test-app/data/test2.json
rename to middleman-core/fixtures/basic-data-app/data/test2.json
diff --git a/fixtures/test-app/source/data.html.erb b/middleman-core/fixtures/basic-data-app/source/data.html.erb
similarity index 100%
rename from fixtures/test-app/source/data.html.erb
rename to middleman-core/fixtures/basic-data-app/source/data.html.erb
diff --git a/fixtures/test-app/source/data3.html.erb b/middleman-core/fixtures/basic-data-app/source/data3.html.erb
similarity index 100%
rename from fixtures/test-app/source/data3.html.erb
rename to middleman-core/fixtures/basic-data-app/source/data3.html.erb
diff --git a/fixtures/build-with-errors-app/config.rb b/middleman-core/fixtures/build-with-errors-app/config.rb
similarity index 100%
rename from fixtures/build-with-errors-app/config.rb
rename to middleman-core/fixtures/build-with-errors-app/config.rb
diff --git a/fixtures/build-with-errors-app/source/index.html.erb b/middleman-core/fixtures/build-with-errors-app/source/index.html.erb
similarity index 100%
rename from fixtures/build-with-errors-app/source/index.html.erb
rename to middleman-core/fixtures/build-with-errors-app/source/index.html.erb
diff --git a/fixtures/chained-app/config.rb b/middleman-core/fixtures/chained-app/config.rb
similarity index 100%
rename from fixtures/chained-app/config.rb
rename to middleman-core/fixtures/chained-app/config.rb
diff --git a/fixtures/chained-app/data/article.yml b/middleman-core/fixtures/chained-app/data/article.yml
similarity index 100%
rename from fixtures/chained-app/data/article.yml
rename to middleman-core/fixtures/chained-app/data/article.yml
diff --git a/middleman-core/fixtures/chained-app/source/index.html.str.erb b/middleman-core/fixtures/chained-app/source/index.html.str.erb
new file mode 100755
index 00000000..a4d97d7e
--- /dev/null
+++ b/middleman-core/fixtures/chained-app/source/index.html.str.erb
@@ -0,0 +1,8 @@
+---
+layout: false
+sup: "Sup"
+---
+
+<h1>#{"<%= data.article.title %>"}</h1>
+<h2>#{"<%= data.article.subtitle %>"}</h2>
+<h3>#{"<%= data.page.sup %>"}</h3>
\ No newline at end of file
diff --git a/fixtures/clean-app/config-complications.rb b/middleman-core/fixtures/clean-app/config-complications.rb
similarity index 100%
rename from fixtures/clean-app/config-complications.rb
rename to middleman-core/fixtures/clean-app/config-complications.rb
diff --git a/fixtures/clean-app/config-empty.rb b/middleman-core/fixtures/clean-app/config-empty.rb
similarity index 100%
rename from fixtures/clean-app/config-empty.rb
rename to middleman-core/fixtures/clean-app/config-empty.rb
diff --git a/fixtures/clean-app/config.rb b/middleman-core/fixtures/clean-app/config.rb
similarity index 100%
rename from fixtures/clean-app/config.rb
rename to middleman-core/fixtures/clean-app/config.rb
diff --git a/fixtures/custom-layout-app/source/index.html.erb b/middleman-core/fixtures/clean-app/source/index.html.erb
similarity index 100%
rename from fixtures/custom-layout-app/source/index.html.erb
rename to middleman-core/fixtures/clean-app/source/index.html.erb
diff --git a/fixtures/different-engine-layout/source/layout.erb b/middleman-core/fixtures/clean-app/source/layout.erb
similarity index 100%
rename from fixtures/different-engine-layout/source/layout.erb
rename to middleman-core/fixtures/clean-app/source/layout.erb
diff --git a/middleman-core/fixtures/clean-app/source/layouts/custom.erb b/middleman-core/fixtures/clean-app/source/layouts/custom.erb
new file mode 100755
index 00000000..c8a83373
--- /dev/null
+++ b/middleman-core/fixtures/clean-app/source/layouts/custom.erb
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Custom Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/clean-app/source/real.html b/middleman-core/fixtures/clean-app/source/real.html
similarity index 100%
rename from fixtures/clean-app/source/real.html
rename to middleman-core/fixtures/clean-app/source/real.html
diff --git a/fixtures/clean-app/source/real/index.html.erb b/middleman-core/fixtures/clean-app/source/real/index.html.erb
similarity index 100%
rename from fixtures/clean-app/source/real/index.html.erb
rename to middleman-core/fixtures/clean-app/source/real/index.html.erb
diff --git a/fixtures/clean-app/source/should_be_ignored.html b/middleman-core/fixtures/clean-app/source/should_be_ignored.html
similarity index 100%
rename from fixtures/clean-app/source/should_be_ignored.html
rename to middleman-core/fixtures/clean-app/source/should_be_ignored.html
diff --git a/fixtures/clean-app/source/should_be_ignored2.html b/middleman-core/fixtures/clean-app/source/should_be_ignored2.html
similarity index 100%
rename from fixtures/clean-app/source/should_be_ignored2.html
rename to middleman-core/fixtures/clean-app/source/should_be_ignored2.html
diff --git a/fixtures/clean-app/source/should_be_ignored3.html b/middleman-core/fixtures/clean-app/source/should_be_ignored3.html
similarity index 100%
rename from fixtures/clean-app/source/should_be_ignored3.html
rename to middleman-core/fixtures/clean-app/source/should_be_ignored3.html
diff --git a/fixtures/clean-app/source/static.html b/middleman-core/fixtures/clean-app/source/static.html
similarity index 100%
rename from fixtures/clean-app/source/static.html
rename to middleman-core/fixtures/clean-app/source/static.html
diff --git a/middleman-core/fixtures/clean-dir-app/config.rb b/middleman-core/fixtures/clean-dir-app/config.rb
new file mode 100644
index 00000000..f343b291
--- /dev/null
+++ b/middleman-core/fixtures/clean-dir-app/config.rb
@@ -0,0 +1 @@
+activate :directory_indexes
\ No newline at end of file
diff --git a/middleman-core/fixtures/clean-dir-app/source/about.html b/middleman-core/fixtures/clean-dir-app/source/about.html
new file mode 100644
index 00000000..c4c4ce51
--- /dev/null
+++ b/middleman-core/fixtures/clean-dir-app/source/about.html
@@ -0,0 +1 @@
+Fun times
\ No newline at end of file
diff --git a/middleman-core/fixtures/content-for-app/config.rb b/middleman-core/fixtures/content-for-app/config.rb
new file mode 100644
index 00000000..e925ac92
--- /dev/null
+++ b/middleman-core/fixtures/content-for-app/config.rb
@@ -0,0 +1,3 @@
+with_layout :content_for do
+  page "/content_for_erb.html"
+end
\ No newline at end of file
diff --git a/fixtures/test-app/source/content_for_erb.html.erb b/middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb
similarity index 100%
rename from fixtures/test-app/source/content_for_erb.html.erb
rename to middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb
diff --git a/fixtures/test-app/source/layouts/content_for.erb b/middleman-core/fixtures/content-for-app/source/layouts/content_for.erb
similarity index 100%
rename from fixtures/test-app/source/layouts/content_for.erb
rename to middleman-core/fixtures/content-for-app/source/layouts/content_for.erb
diff --git a/middleman-core/fixtures/current-page-app/config.rb b/middleman-core/fixtures/current-page-app/config.rb
new file mode 100644
index 00000000..4a31e7d3
--- /dev/null
+++ b/middleman-core/fixtures/current-page-app/config.rb
@@ -0,0 +1,3 @@
+with_layout false do
+  page "/request-path.html"
+end
\ No newline at end of file
diff --git a/fixtures/test-app/source/request-path.html.erb b/middleman-core/fixtures/current-page-app/source/request-path.html.erb
similarity index 100%
rename from fixtures/test-app/source/request-path.html.erb
rename to middleman-core/fixtures/current-page-app/source/request-path.html.erb
diff --git a/middleman-core/fixtures/custom-layout-app/config.rb b/middleman-core/fixtures/custom-layout-app/config.rb
new file mode 100644
index 00000000..37588a5c
--- /dev/null
+++ b/middleman-core/fixtures/custom-layout-app/config.rb
@@ -0,0 +1 @@
+set :erb, :layout_engine => :str
\ No newline at end of file
diff --git a/fixtures/engine-matching-layout/source/index.html.erb b/middleman-core/fixtures/custom-layout-app/source/index.html.erb
similarity index 100%
rename from fixtures/engine-matching-layout/source/index.html.erb
rename to middleman-core/fixtures/custom-layout-app/source/index.html.erb
diff --git a/middleman-core/fixtures/custom-layout-app/source/layout.str b/middleman-core/fixtures/custom-layout-app/source/layout.str
new file mode 100644
index 00000000..b827c987
--- /dev/null
+++ b/middleman-core/fixtures/custom-layout-app/source/layout.str
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    #{yield}
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/different-engine-layout/config.rb b/middleman-core/fixtures/custom-layout-app2/config.rb
similarity index 100%
rename from fixtures/different-engine-layout/config.rb
rename to middleman-core/fixtures/custom-layout-app2/config.rb
diff --git a/fixtures/manual-layout-missing/source/index.html.erb b/middleman-core/fixtures/custom-layout-app2/source/custom-layout-dir/index.html.erb
similarity index 100%
rename from fixtures/manual-layout-missing/source/index.html.erb
rename to middleman-core/fixtures/custom-layout-app2/source/custom-layout-dir/index.html.erb
diff --git a/fixtures/manual-layout-override/source/index.html.erb b/middleman-core/fixtures/custom-layout-app2/source/custom-layout.html.erb
similarity index 100%
rename from fixtures/manual-layout-override/source/index.html.erb
rename to middleman-core/fixtures/custom-layout-app2/source/custom-layout.html.erb
diff --git a/middleman-core/fixtures/custom-layout-app2/source/layouts/custom.erb b/middleman-core/fixtures/custom-layout-app2/source/layouts/custom.erb
new file mode 100755
index 00000000..c8a83373
--- /dev/null
+++ b/middleman-core/fixtures/custom-layout-app2/source/layouts/custom.erb
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Custom Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/data-app/config.rb b/middleman-core/fixtures/data-app/config.rb
similarity index 100%
rename from fixtures/data-app/config.rb
rename to middleman-core/fixtures/data-app/config.rb
diff --git a/fixtures/data-app/data/pages.yml b/middleman-core/fixtures/data-app/data/pages.yml
similarity index 100%
rename from fixtures/data-app/data/pages.yml
rename to middleman-core/fixtures/data-app/data/pages.yml
diff --git a/fixtures/manual-layout/source/index.html.erb b/middleman-core/fixtures/data-app/source/index.html.erb
similarity index 100%
rename from fixtures/manual-layout/source/index.html.erb
rename to middleman-core/fixtures/data-app/source/index.html.erb
diff --git a/middleman-core/fixtures/data-app/source/layout.erb b/middleman-core/fixtures/data-app/source/layout.erb
new file mode 100644
index 00000000..0520e80c
--- /dev/null
+++ b/middleman-core/fixtures/data-app/source/layout.erb
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/different-engine-partial/config.rb b/middleman-core/fixtures/different-engine-layout/config.rb
similarity index 100%
rename from fixtures/different-engine-partial/config.rb
rename to middleman-core/fixtures/different-engine-layout/config.rb
diff --git a/fixtures/multiple-layouts/source/index.html.erb b/middleman-core/fixtures/different-engine-layout/source/index.html.str
similarity index 100%
rename from fixtures/multiple-layouts/source/index.html.erb
rename to middleman-core/fixtures/different-engine-layout/source/index.html.str
diff --git a/fixtures/engine-matching-layout/source/layout.erb b/middleman-core/fixtures/different-engine-layout/source/layout.erb
similarity index 100%
rename from fixtures/engine-matching-layout/source/layout.erb
rename to middleman-core/fixtures/different-engine-layout/source/layout.erb
diff --git a/fixtures/engine-matching-layout/config.rb b/middleman-core/fixtures/different-engine-partial/config.rb
similarity index 100%
rename from fixtures/engine-matching-layout/config.rb
rename to middleman-core/fixtures/different-engine-partial/config.rb
diff --git a/fixtures/different-engine-partial/source/index.html.erb b/middleman-core/fixtures/different-engine-partial/source/index.html.erb
similarity index 100%
rename from fixtures/different-engine-partial/source/index.html.erb
rename to middleman-core/fixtures/different-engine-partial/source/index.html.erb
diff --git a/fixtures/different-engine-partial/source/layouts/layout.erb b/middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb
similarity index 100%
rename from fixtures/different-engine-partial/source/layouts/layout.erb
rename to middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb
diff --git a/middleman-core/fixtures/different-engine-partial/source/shared/_footer.str b/middleman-core/fixtures/different-engine-partial/source/shared/_footer.str
new file mode 100644
index 00000000..fda5057e
--- /dev/null
+++ b/middleman-core/fixtures/different-engine-partial/source/shared/_footer.str
@@ -0,0 +1 @@
+<footer>Str Footer</footer>
\ No newline at end of file
diff --git a/fixtures/different-engine-partial/source/shared/_header.erb b/middleman-core/fixtures/different-engine-partial/source/shared/_header.erb
similarity index 100%
rename from fixtures/different-engine-partial/source/shared/_header.erb
rename to middleman-core/fixtures/different-engine-partial/source/shared/_header.erb
diff --git a/middleman-core/fixtures/dynamic-pages-app/config.rb b/middleman-core/fixtures/dynamic-pages-app/config.rb
new file mode 100644
index 00000000..e23f0118
--- /dev/null
+++ b/middleman-core/fixtures/dynamic-pages-app/config.rb
@@ -0,0 +1,29 @@
+page "/fake.html", :proxy => "/real.html", :layout => false
+page "fake2.html", :proxy => "/real.html", :layout => false
+page "fake3.html", :proxy => "real.html", :layout => false
+page "/fake4.html", :proxy => "real.html", :layout => false
+
+ignore "/should_be_ignored.html"
+page "/should_be_ignored2.html", :ignore => true
+page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
+
+ignore "should_be_ignored4.html"
+page "should_be_ignored5.html", :ignore => true
+page "target_ignore2.html", :proxy => "/should_be_ignored6.html", :ignore => true
+page "target_ignore3.html", :proxy => "should_be_ignored7.html", :ignore => true
+page "/target_ignore4.html", :proxy => "should_be_ignored8.html", :ignore => true
+
+%w(one two).each do |num|
+  page "/fake/#{num}.html", :proxy => "/real/index.html" do
+    @num = num
+  end
+  page "fake2/#{num}.html", :proxy => "/real/index.html" do
+    @num = num
+  end
+  page "fake3/#{num}.html", :proxy => "real/index.html" do
+    @num = num
+  end
+  page "/fake4/#{num}.html", :proxy => "real/index.html" do
+    @num = num
+  end
+end
\ No newline at end of file
diff --git a/fixtures/test-app/source/real.html b/middleman-core/fixtures/dynamic-pages-app/source/real.html
similarity index 100%
rename from fixtures/test-app/source/real.html
rename to middleman-core/fixtures/dynamic-pages-app/source/real.html
diff --git a/fixtures/test-app/source/real/index.html.erb b/middleman-core/fixtures/dynamic-pages-app/source/real/index.html.erb
similarity index 100%
rename from fixtures/test-app/source/real/index.html.erb
rename to middleman-core/fixtures/dynamic-pages-app/source/real/index.html.erb
diff --git a/fixtures/test-app/source/should_be_ignored.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored.html
diff --git a/fixtures/test-app/source/should_be_ignored2.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored2.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored2.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored2.html
diff --git a/fixtures/test-app/source/should_be_ignored3.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored3.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored3.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored3.html
diff --git a/fixtures/test-app/source/should_be_ignored4.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored4.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored4.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored4.html
diff --git a/fixtures/test-app/source/should_be_ignored5.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored5.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored5.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored5.html
diff --git a/fixtures/test-app/source/should_be_ignored6.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored6.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored6.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored6.html
diff --git a/fixtures/test-app/source/should_be_ignored7.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored7.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored7.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored7.html
diff --git a/fixtures/test-app/source/should_be_ignored8.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored8.html
similarity index 100%
rename from fixtures/test-app/source/should_be_ignored8.html
rename to middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored8.html
diff --git a/fixtures/empty-app/not-config.rb b/middleman-core/fixtures/empty-app/not-config.rb
similarity index 100%
rename from fixtures/empty-app/not-config.rb
rename to middleman-core/fixtures/empty-app/not-config.rb
diff --git a/fixtures/fonts-app/config.rb b/middleman-core/fixtures/engine-matching-layout/config.rb
similarity index 100%
rename from fixtures/fonts-app/config.rb
rename to middleman-core/fixtures/engine-matching-layout/config.rb
diff --git a/fixtures/no-layout/source/index.html.erb b/middleman-core/fixtures/engine-matching-layout/source/index.html.erb
similarity index 100%
rename from fixtures/no-layout/source/index.html.erb
rename to middleman-core/fixtures/engine-matching-layout/source/index.html.erb
diff --git a/middleman-core/fixtures/engine-matching-layout/source/layout.erb b/middleman-core/fixtures/engine-matching-layout/source/layout.erb
new file mode 100644
index 00000000..b72f66e9
--- /dev/null
+++ b/middleman-core/fixtures/engine-matching-layout/source/layout.erb
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/external-helpers/config.rb b/middleman-core/fixtures/external-helpers/config.rb
similarity index 100%
rename from fixtures/external-helpers/config.rb
rename to middleman-core/fixtures/external-helpers/config.rb
diff --git a/fixtures/external-helpers/lib/hello_helper.rb b/middleman-core/fixtures/external-helpers/lib/hello_helper.rb
similarity index 100%
rename from fixtures/external-helpers/lib/hello_helper.rb
rename to middleman-core/fixtures/external-helpers/lib/hello_helper.rb
diff --git a/fixtures/external-helpers/source/index.html.erb b/middleman-core/fixtures/external-helpers/source/index.html.erb
similarity index 100%
rename from fixtures/external-helpers/source/index.html.erb
rename to middleman-core/fixtures/external-helpers/source/index.html.erb
diff --git a/fixtures/feature-params-app/config.rb b/middleman-core/fixtures/feature-params-app/config.rb
similarity index 100%
rename from fixtures/feature-params-app/config.rb
rename to middleman-core/fixtures/feature-params-app/config.rb
diff --git a/fixtures/feature-params-app/source/index.html.erb b/middleman-core/fixtures/feature-params-app/source/index.html.erb
similarity index 100%
rename from fixtures/feature-params-app/source/index.html.erb
rename to middleman-core/fixtures/feature-params-app/source/index.html.erb
diff --git a/fixtures/instance-vars-app/config.rb b/middleman-core/fixtures/frontmatter-app/config.rb
similarity index 100%
rename from fixtures/instance-vars-app/config.rb
rename to middleman-core/fixtures/frontmatter-app/config.rb
diff --git a/fixtures/test-app/source/front-matter-2.php.erb b/middleman-core/fixtures/frontmatter-app/source/front-matter-2.php.erb
similarity index 100%
rename from fixtures/test-app/source/front-matter-2.php.erb
rename to middleman-core/fixtures/frontmatter-app/source/front-matter-2.php.erb
diff --git a/fixtures/test-app/source/front-matter-change.html.erb b/middleman-core/fixtures/frontmatter-app/source/front-matter-change.html.erb
similarity index 100%
rename from fixtures/test-app/source/front-matter-change.html.erb
rename to middleman-core/fixtures/frontmatter-app/source/front-matter-change.html.erb
diff --git a/fixtures/test-app/source/front-matter.html.erb b/middleman-core/fixtures/frontmatter-app/source/front-matter.html.erb
similarity index 100%
rename from fixtures/test-app/source/front-matter.html.erb
rename to middleman-core/fixtures/frontmatter-app/source/front-matter.html.erb
diff --git a/middleman-core/fixtures/generator-test/config.rb b/middleman-core/fixtures/generator-test/config.rb
new file mode 100644
index 00000000..15b309eb
--- /dev/null
+++ b/middleman-core/fixtures/generator-test/config.rb
@@ -0,0 +1,80 @@
+### 
+# Compass
+###
+
+# Susy grids in Compass
+# First: gem install compass-susy-plugin
+# require 'susy'
+
+# Change Compass configuration
+# compass_config do |config|
+#   config.output_style = :compact
+# end
+
+###
+# Page options, layouts, aliases and proxies
+###
+
+# Per-page layout changes:
+# 
+# With no layout
+# page "/path/to/file.html", :layout => false
+# 
+# With alternative layout
+# page "/path/to/file.html", :layout => :otherlayout
+# 
+# A path which all have the same layout
+# with_layout :admin do
+#   page "/admin/*"
+# end
+
+# Proxy (fake) files
+# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
+#   @which_fake_page = "Rendering a fake page with a variable"
+# end
+
+###
+# Helpers
+###
+
+# Automatic image dimensions on image_tag helper
+# activate :automatic_image_sizes
+
+# Methods defined in the helpers block are available in templates
+# helpers do
+#   def some_helper
+#     "Helping"
+#   end
+# end
+
+# Change the CSS directory
+# set :css_dir, "alternative_css_directory"
+
+# Change the JS directory
+# set :js_dir, "alternative_js_directory"
+
+# Change the images directory
+# set :images_dir, "alternative_image_directory"
+
+# Build-specific configuration
+configure :build do
+  # For example, change the Compass output style for deployment
+  # activate :minify_css
+  
+  # Minify Javascript on build
+  # activate :minify_javascript
+  
+  # Enable cache buster
+  # activate :cache_buster
+  
+  # Use relative URLs
+  # activate :relative_assets
+  
+  # Compress PNGs after build
+  # First: gem install middleman-smusher
+  # require "middleman-smusher"
+  # activate :smusher
+  
+  # Or use a different image path
+  # set :http_path, "/Content/images/"
+end
\ No newline at end of file
diff --git a/lib/middleman/templates/default/source/index.html.erb b/middleman-core/fixtures/generator-test/source/index.html.erb
similarity index 100%
rename from lib/middleman/templates/default/source/index.html.erb
rename to middleman-core/fixtures/generator-test/source/index.html.erb
diff --git a/fixtures/glob-app/config.rb b/middleman-core/fixtures/glob-app/config.rb
similarity index 100%
rename from fixtures/glob-app/config.rb
rename to middleman-core/fixtures/glob-app/config.rb
diff --git a/middleman-core/fixtures/glob-app/source/index.html.erb b/middleman-core/fixtures/glob-app/source/index.html.erb
new file mode 100755
index 00000000..699556d6
--- /dev/null
+++ b/middleman-core/fixtures/glob-app/source/index.html.erb
@@ -0,0 +1,4 @@
+<h1>Welcome</h1>
+
+<h2></h2>
+<p>Paragraph</p>
\ No newline at end of file
diff --git a/middleman-core/fixtures/glob-app/source/stylesheets/site.css.str b/middleman-core/fixtures/glob-app/source/stylesheets/site.css.str
new file mode 100755
index 00000000..987fee2b
--- /dev/null
+++ b/middleman-core/fixtures/glob-app/source/stylesheets/site.css.str
@@ -0,0 +1,3 @@
+body {
+
+}
\ No newline at end of file
diff --git a/fixtures/ignore-app/config.rb b/middleman-core/fixtures/ignore-app/config.rb
similarity index 100%
rename from fixtures/ignore-app/config.rb
rename to middleman-core/fixtures/ignore-app/config.rb
diff --git a/fixtures/ignore-app/source/articles/template.html.erb b/middleman-core/fixtures/ignore-app/source/articles/template.html.erb
similarity index 100%
rename from fixtures/ignore-app/source/articles/template.html.erb
rename to middleman-core/fixtures/ignore-app/source/articles/template.html.erb
diff --git a/fixtures/ignore-app/source/template.html.erb b/middleman-core/fixtures/ignore-app/source/template.html.erb
similarity index 100%
rename from fixtures/ignore-app/source/template.html.erb
rename to middleman-core/fixtures/ignore-app/source/template.html.erb
diff --git a/fixtures/indexable-app/config.rb b/middleman-core/fixtures/indexable-app/config.rb
similarity index 100%
rename from fixtures/indexable-app/config.rb
rename to middleman-core/fixtures/indexable-app/config.rb
diff --git a/fixtures/asset-host-app/source/.htaccess b/middleman-core/fixtures/indexable-app/source/.htaccess
similarity index 100%
rename from fixtures/asset-host-app/source/.htaccess
rename to middleman-core/fixtures/indexable-app/source/.htaccess
diff --git a/fixtures/indexable-app/source/a_folder/needs_index.html b/middleman-core/fixtures/indexable-app/source/a_folder/needs_index.html
similarity index 100%
rename from fixtures/indexable-app/source/a_folder/needs_index.html
rename to middleman-core/fixtures/indexable-app/source/a_folder/needs_index.html
diff --git a/fixtures/indexable-app/source/leave_me_alone.html b/middleman-core/fixtures/indexable-app/source/leave_me_alone.html
similarity index 100%
rename from fixtures/indexable-app/source/leave_me_alone.html
rename to middleman-core/fixtures/indexable-app/source/leave_me_alone.html
diff --git a/fixtures/indexable-app/source/needs_index.html b/middleman-core/fixtures/indexable-app/source/needs_index.html
similarity index 100%
rename from fixtures/indexable-app/source/needs_index.html
rename to middleman-core/fixtures/indexable-app/source/needs_index.html
diff --git a/fixtures/indexable-app/source/regular/index.html b/middleman-core/fixtures/indexable-app/source/regular/index.html
similarity index 100%
rename from fixtures/indexable-app/source/regular/index.html
rename to middleman-core/fixtures/indexable-app/source/regular/index.html
diff --git a/fixtures/multiple-layouts/config.rb b/middleman-core/fixtures/instance-vars-app/config.rb
similarity index 100%
rename from fixtures/multiple-layouts/config.rb
rename to middleman-core/fixtures/instance-vars-app/config.rb
diff --git a/fixtures/instance-vars-app/source/_vartial.erb b/middleman-core/fixtures/instance-vars-app/source/_vartial.erb
similarity index 100%
rename from fixtures/instance-vars-app/source/_vartial.erb
rename to middleman-core/fixtures/instance-vars-app/source/_vartial.erb
diff --git a/fixtures/instance-vars-app/source/instance-var-set.html.erb b/middleman-core/fixtures/instance-vars-app/source/instance-var-set.html.erb
similarity index 100%
rename from fixtures/instance-vars-app/source/instance-var-set.html.erb
rename to middleman-core/fixtures/instance-vars-app/source/instance-var-set.html.erb
diff --git a/fixtures/instance-vars-app/source/layout.erb b/middleman-core/fixtures/instance-vars-app/source/layout.erb
similarity index 100%
rename from fixtures/instance-vars-app/source/layout.erb
rename to middleman-core/fixtures/instance-vars-app/source/layout.erb
diff --git a/fixtures/instance-vars-app/source/no-instance-var.html.erb b/middleman-core/fixtures/instance-vars-app/source/no-instance-var.html.erb
similarity index 100%
rename from fixtures/instance-vars-app/source/no-instance-var.html.erb
rename to middleman-core/fixtures/instance-vars-app/source/no-instance-var.html.erb
diff --git a/middleman-core/fixtures/large-build-app/config.rb b/middleman-core/fixtures/large-build-app/config.rb
new file mode 100644
index 00000000..5ed630e8
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/config.rb
@@ -0,0 +1,3 @@
+with_layout false do
+  page "/spaces in file.html"
+end
\ No newline at end of file
diff --git a/fixtures/indexable-app/source/.htaccess b/middleman-core/fixtures/large-build-app/source/.htaccess
similarity index 100%
rename from fixtures/indexable-app/source/.htaccess
rename to middleman-core/fixtures/large-build-app/source/.htaccess
diff --git a/middleman-core/fixtures/large-build-app/source/_partial.erb b/middleman-core/fixtures/large-build-app/source/_partial.erb
new file mode 100755
index 00000000..be8c667b
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/_partial.erb
@@ -0,0 +1 @@
+<p>Test</p>
\ No newline at end of file
diff --git a/fixtures/test-app/source/images/Child folder/regular_file(example).txt b/middleman-core/fixtures/large-build-app/source/images/Child folder/regular_file(example).txt
similarity index 100%
rename from fixtures/test-app/source/images/Child folder/regular_file(example).txt
rename to middleman-core/fixtures/large-build-app/source/images/Child folder/regular_file(example).txt
diff --git a/fixtures/test-app/source/images/Read me (example).txt b/middleman-core/fixtures/large-build-app/source/images/Read me (example).txt
similarity index 100%
rename from fixtures/test-app/source/images/Read me (example).txt
rename to middleman-core/fixtures/large-build-app/source/images/Read me (example).txt
diff --git a/fixtures/asset-host-app/source/images/blank.gif b/middleman-core/fixtures/large-build-app/source/images/blank.gif
similarity index 100%
rename from fixtures/asset-host-app/source/images/blank.gif
rename to middleman-core/fixtures/large-build-app/source/images/blank.gif
diff --git a/middleman-core/fixtures/large-build-app/source/index.html.erb b/middleman-core/fixtures/large-build-app/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/middleman-core/fixtures/large-build-app/source/layout.erb b/middleman-core/fixtures/large-build-app/source/layout.erb
new file mode 100644
index 00000000..b72f66e9
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/layout.erb
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/middleman-core/fixtures/large-build-app/source/layouts/content_for.erb b/middleman-core/fixtures/large-build-app/source/layouts/content_for.erb
new file mode 100644
index 00000000..30a09340
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/layouts/content_for.erb
@@ -0,0 +1,4 @@
+In Layout: <%= yield_content(:from_template).chomp.strip %>
+
+In Template:
+<%= yield %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/large-build-app/source/layouts/custom.erb b/middleman-core/fixtures/large-build-app/source/layouts/custom.erb
new file mode 100755
index 00000000..c8a83373
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/layouts/custom.erb
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Custom Layout</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/test-app/source/other_layout.erb b/middleman-core/fixtures/large-build-app/source/other_layout.erb
similarity index 100%
rename from fixtures/test-app/source/other_layout.erb
rename to middleman-core/fixtures/large-build-app/source/other_layout.erb
diff --git a/middleman-core/fixtures/large-build-app/source/services/index.html.erb b/middleman-core/fixtures/large-build-app/source/services/index.html.erb
new file mode 100755
index 00000000..896146e9
--- /dev/null
+++ b/middleman-core/fixtures/large-build-app/source/services/index.html.erb
@@ -0,0 +1 @@
+<h2>Services</h2>
\ No newline at end of file
diff --git a/fixtures/test-app/source/spaces in file.html.erb b/middleman-core/fixtures/large-build-app/source/spaces in file.html.erb
similarity index 100%
rename from fixtures/test-app/source/spaces in file.html.erb
rename to middleman-core/fixtures/large-build-app/source/spaces in file.html.erb
diff --git a/fixtures/test-app/source/static.html b/middleman-core/fixtures/large-build-app/source/static.html
similarity index 100%
rename from fixtures/test-app/source/static.html
rename to middleman-core/fixtures/large-build-app/source/static.html
diff --git a/fixtures/test-app/source/stylesheets/static.css b/middleman-core/fixtures/large-build-app/source/stylesheets/static.css
similarity index 100%
rename from fixtures/test-app/source/stylesheets/static.css
rename to middleman-core/fixtures/large-build-app/source/stylesheets/static.css
diff --git a/fixtures/no-layout/config.rb b/middleman-core/fixtures/lorem-app/config.rb
similarity index 100%
rename from fixtures/no-layout/config.rb
rename to middleman-core/fixtures/lorem-app/config.rb
diff --git a/fixtures/test-app/source/lorem.html.erb b/middleman-core/fixtures/lorem-app/source/lorem.html.erb
similarity index 100%
rename from fixtures/test-app/source/lorem.html.erb
rename to middleman-core/fixtures/lorem-app/source/lorem.html.erb
diff --git a/fixtures/manual-layout-missing/config.rb b/middleman-core/fixtures/manual-layout-missing/config.rb
similarity index 100%
rename from fixtures/manual-layout-missing/config.rb
rename to middleman-core/fixtures/manual-layout-missing/config.rb
diff --git a/middleman-core/fixtures/manual-layout-missing/source/index.html.erb b/middleman-core/fixtures/manual-layout-missing/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/manual-layout-missing/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/fixtures/manual-layout-override/config.rb b/middleman-core/fixtures/manual-layout-override/config.rb
similarity index 100%
rename from fixtures/manual-layout-override/config.rb
rename to middleman-core/fixtures/manual-layout-override/config.rb
diff --git a/middleman-core/fixtures/manual-layout-override/source/index.html.erb b/middleman-core/fixtures/manual-layout-override/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/manual-layout-override/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/fixtures/manual-layout-override/source/layouts/another.erb b/middleman-core/fixtures/manual-layout-override/source/layouts/another.erb
similarity index 100%
rename from fixtures/manual-layout-override/source/layouts/another.erb
rename to middleman-core/fixtures/manual-layout-override/source/layouts/another.erb
diff --git a/fixtures/manual-layout-override/source/layouts/custom.erb b/middleman-core/fixtures/manual-layout-override/source/layouts/custom.erb
similarity index 100%
rename from fixtures/manual-layout-override/source/layouts/custom.erb
rename to middleman-core/fixtures/manual-layout-override/source/layouts/custom.erb
diff --git a/fixtures/manual-layout/config.rb b/middleman-core/fixtures/manual-layout/config.rb
similarity index 100%
rename from fixtures/manual-layout/config.rb
rename to middleman-core/fixtures/manual-layout/config.rb
diff --git a/middleman-core/fixtures/manual-layout/source/index.html.erb b/middleman-core/fixtures/manual-layout/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/manual-layout/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/fixtures/manual-layout/source/layouts/custom.erb b/middleman-core/fixtures/manual-layout/source/layouts/custom.erb
similarity index 100%
rename from fixtures/manual-layout/source/layouts/custom.erb
rename to middleman-core/fixtures/manual-layout/source/layouts/custom.erb
diff --git a/fixtures/partials-app/config.rb b/middleman-core/fixtures/multiple-layouts/config.rb
similarity index 100%
rename from fixtures/partials-app/config.rb
rename to middleman-core/fixtures/multiple-layouts/config.rb
diff --git a/middleman-core/fixtures/multiple-layouts/source/index.html.erb b/middleman-core/fixtures/multiple-layouts/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/multiple-layouts/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/fixtures/multiple-layouts/source/layout.erb b/middleman-core/fixtures/multiple-layouts/source/layout.erb
similarity index 100%
rename from fixtures/multiple-layouts/source/layout.erb
rename to middleman-core/fixtures/multiple-layouts/source/layout.erb
diff --git a/middleman-core/fixtures/multiple-layouts/source/layout.str b/middleman-core/fixtures/multiple-layouts/source/layout.str
new file mode 100644
index 00000000..23e3213d
--- /dev/null
+++ b/middleman-core/fixtures/multiple-layouts/source/layout.str
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- ERb Comment in layout -->
+  </head>
+  <body>
+    #{yield}
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/nested-layout-app/config.rb b/middleman-core/fixtures/nested-layout-app/config.rb
similarity index 100%
rename from fixtures/nested-layout-app/config.rb
rename to middleman-core/fixtures/nested-layout-app/config.rb
diff --git a/fixtures/nested-layout-app/source/data-one.html.erb b/middleman-core/fixtures/nested-layout-app/source/data-one.html.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/data-one.html.erb
rename to middleman-core/fixtures/nested-layout-app/source/data-one.html.erb
diff --git a/fixtures/nested-layout-app/source/data-two.html.erb b/middleman-core/fixtures/nested-layout-app/source/data-two.html.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/data-two.html.erb
rename to middleman-core/fixtures/nested-layout-app/source/data-two.html.erb
diff --git a/fixtures/nested-layout-app/source/index.html.erb b/middleman-core/fixtures/nested-layout-app/source/index.html.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/index.html.erb
rename to middleman-core/fixtures/nested-layout-app/source/index.html.erb
diff --git a/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/layouts/inner.erb
rename to middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
diff --git a/fixtures/nested-layout-app/source/layouts/master.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/layouts/master.erb
rename to middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
diff --git a/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
similarity index 100%
rename from fixtures/nested-layout-app/source/layouts/outer.erb
rename to middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
diff --git a/fixtures/preview-app/config.rb b/middleman-core/fixtures/no-layout/config.rb
similarity index 100%
rename from fixtures/preview-app/config.rb
rename to middleman-core/fixtures/no-layout/config.rb
diff --git a/middleman-core/fixtures/no-layout/source/index.html.erb b/middleman-core/fixtures/no-layout/source/index.html.erb
new file mode 100755
index 00000000..f47aba51
--- /dev/null
+++ b/middleman-core/fixtures/no-layout/source/index.html.erb
@@ -0,0 +1 @@
+<h1>Welcome</h1>
\ No newline at end of file
diff --git a/fixtures/relative-app/config.rb b/middleman-core/fixtures/padrino-helpers-app/config.rb
similarity index 100%
rename from fixtures/relative-app/config.rb
rename to middleman-core/fixtures/padrino-helpers-app/config.rb
diff --git a/middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb b/middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
new file mode 100644
index 00000000..f83a33bb
--- /dev/null
+++ b/middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
@@ -0,0 +1,4 @@
+<%= stylesheet_link_tag "test1" %>
+<%= javascript_include_tag "test1" %>
+<%= image_tag "test2.png", :alt => "alt" %>
+<%= link_to "Has param", "test2.com", :class => "test" %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/config.rb b/middleman-core/fixtures/page-classes-app/config.rb
new file mode 100644
index 00000000..39044295
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/config.rb
@@ -0,0 +1,4 @@
+with_layout false do
+  page "/sub1/page-classes.html"
+  page "/sub1/sub2/page-classes.html"
+end
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/page-classes.html.erb
new file mode 100755
index 00000000..02cb5c95
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/page-classes.html.erb
@@ -0,0 +1 @@
+<%= page_classes %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb
new file mode 100755
index 00000000..02cb5c95
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb
@@ -0,0 +1 @@
+<%= page_classes %>
\ No newline at end of file
diff --git a/middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
new file mode 100755
index 00000000..02cb5c95
--- /dev/null
+++ b/middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb
@@ -0,0 +1 @@
+<%= page_classes %>
\ No newline at end of file
diff --git a/fixtures/traversal-app/source/directory-indexed.html.erb b/middleman-core/fixtures/partials-app/config.rb
similarity index 100%
rename from fixtures/traversal-app/source/directory-indexed.html.erb
rename to middleman-core/fixtures/partials-app/config.rb
diff --git a/fixtures/partials-app/source/_locals.erb b/middleman-core/fixtures/partials-app/source/_locals.erb
similarity index 100%
rename from fixtures/partials-app/source/_locals.erb
rename to middleman-core/fixtures/partials-app/source/_locals.erb
diff --git a/fixtures/partials-app/source/_main.erb b/middleman-core/fixtures/partials-app/source/_main.erb
similarity index 100%
rename from fixtures/partials-app/source/_main.erb
rename to middleman-core/fixtures/partials-app/source/_main.erb
diff --git a/middleman-core/fixtures/partials-app/source/_main.str b/middleman-core/fixtures/partials-app/source/_main.str
new file mode 100644
index 00000000..1d764781
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/_main.str
@@ -0,0 +1 @@
+Str Main
\ No newline at end of file
diff --git a/fixtures/partials-app/source/index.html.erb b/middleman-core/fixtures/partials-app/source/index.html.erb
similarity index 100%
rename from fixtures/partials-app/source/index.html.erb
rename to middleman-core/fixtures/partials-app/source/index.html.erb
diff --git a/fixtures/partials-app/source/locals.html.erb b/middleman-core/fixtures/partials-app/source/locals.html.erb
similarity index 100%
rename from fixtures/partials-app/source/locals.html.erb
rename to middleman-core/fixtures/partials-app/source/locals.html.erb
diff --git a/middleman-core/fixtures/partials-app/source/second.html.str b/middleman-core/fixtures/partials-app/source/second.html.str
new file mode 100755
index 00000000..5d84e512
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/second.html.str
@@ -0,0 +1,3 @@
+#{partial "shared/header"}
+#{partial "main"}
+#{partial "shared/footer"}
\ No newline at end of file
diff --git a/fixtures/partials-app/source/shared/_footer.erb b/middleman-core/fixtures/partials-app/source/shared/_footer.erb
similarity index 100%
rename from fixtures/partials-app/source/shared/_footer.erb
rename to middleman-core/fixtures/partials-app/source/shared/_footer.erb
diff --git a/fixtures/partials-app/source/shared/_header.erb b/middleman-core/fixtures/partials-app/source/shared/_header.erb
similarity index 100%
rename from fixtures/partials-app/source/shared/_header.erb
rename to middleman-core/fixtures/partials-app/source/shared/_header.erb
diff --git a/fixtures/partials-app/source/sub/_local.erb b/middleman-core/fixtures/partials-app/source/sub/_local.erb
similarity index 100%
rename from fixtures/partials-app/source/sub/_local.erb
rename to middleman-core/fixtures/partials-app/source/sub/_local.erb
diff --git a/fixtures/partials-app/source/sub/index.html.erb b/middleman-core/fixtures/partials-app/source/sub/index.html.erb
similarity index 100%
rename from fixtures/partials-app/source/sub/index.html.erb
rename to middleman-core/fixtures/partials-app/source/sub/index.html.erb
diff --git a/fixtures/passthrough-app/config.rb b/middleman-core/fixtures/passthrough-app/config.rb
similarity index 100%
rename from fixtures/passthrough-app/config.rb
rename to middleman-core/fixtures/passthrough-app/config.rb
diff --git a/fixtures/passthrough-app/source/.htaccess b/middleman-core/fixtures/passthrough-app/source/.htaccess
similarity index 100%
rename from fixtures/passthrough-app/source/.htaccess
rename to middleman-core/fixtures/passthrough-app/source/.htaccess
diff --git a/fixtures/passthrough-app/source/inline-coffeescript.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml
similarity index 100%
rename from fixtures/passthrough-app/source/inline-coffeescript.html.haml
rename to middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml
diff --git a/fixtures/passthrough-app/source/inline-css.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-css.html.haml
similarity index 100%
rename from fixtures/passthrough-app/source/inline-css.html.haml
rename to middleman-core/fixtures/passthrough-app/source/inline-css.html.haml
diff --git a/fixtures/passthrough-app/source/inline-js.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-js.html.haml
similarity index 100%
rename from fixtures/passthrough-app/source/inline-js.html.haml
rename to middleman-core/fixtures/passthrough-app/source/inline-js.html.haml
diff --git a/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee b/middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
similarity index 100%
rename from fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
rename to middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
diff --git a/fixtures/passthrough-app/source/javascripts/js_test.js b/middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js
similarity index 100%
rename from fixtures/passthrough-app/source/javascripts/js_test.js
rename to middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js
diff --git a/fixtures/glob-app/source/stylesheets/site.css.sass b/middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass
similarity index 100%
rename from fixtures/glob-app/source/stylesheets/site.css.sass
rename to middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass
diff --git a/fixtures/plain-app/index.html b/middleman-core/fixtures/plain-app/index.html
similarity index 100%
rename from fixtures/plain-app/index.html
rename to middleman-core/fixtures/plain-app/index.html
diff --git a/fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb b/middleman-core/fixtures/preview-app/config.rb
similarity index 100%
rename from fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb
rename to middleman-core/fixtures/preview-app/config.rb
diff --git a/fixtures/preview-app/source/content.html.erb b/middleman-core/fixtures/preview-app/source/content.html.erb
similarity index 100%
rename from fixtures/preview-app/source/content.html.erb
rename to middleman-core/fixtures/preview-app/source/content.html.erb
diff --git a/fixtures/preview-app/source/layout.erb b/middleman-core/fixtures/preview-app/source/layout.erb
similarity index 100%
rename from fixtures/preview-app/source/layout.erb
rename to middleman-core/fixtures/preview-app/source/layout.erb
diff --git a/fixtures/sinatra-app/config.rb b/middleman-core/fixtures/sinatra-app/config.rb
similarity index 100%
rename from fixtures/sinatra-app/config.rb
rename to middleman-core/fixtures/sinatra-app/config.rb
diff --git a/fixtures/sinatra-app/source/index.html.erb b/middleman-core/fixtures/sinatra-app/source/index.html.erb
similarity index 100%
rename from fixtures/sinatra-app/source/index.html.erb
rename to middleman-core/fixtures/sinatra-app/source/index.html.erb
diff --git a/fixtures/traversal-app/config.rb b/middleman-core/fixtures/traversal-app/config.rb
similarity index 100%
rename from fixtures/traversal-app/config.rb
rename to middleman-core/fixtures/traversal-app/config.rb
diff --git a/fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb b/middleman-core/fixtures/traversal-app/source/directory-indexed.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb
rename to middleman-core/fixtures/traversal-app/source/directory-indexed.html.erb
diff --git a/fixtures/traversal-app/source/directory-indexed/sibling.html.erb b/middleman-core/fixtures/traversal-app/source/directory-indexed/sibling.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/directory-indexed/sibling.html.erb
rename to middleman-core/fixtures/traversal-app/source/directory-indexed/sibling.html.erb
diff --git a/fixtures/traversal-app/source/directory-indexed/sibling2.html.erb b/middleman-core/fixtures/traversal-app/source/directory-indexed/sibling2.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/directory-indexed/sibling2.html.erb
rename to middleman-core/fixtures/traversal-app/source/directory-indexed/sibling2.html.erb
diff --git a/fixtures/traversal-app/source/index.html.erb b/middleman-core/fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/index.html.erb
rename to middleman-core/fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb
diff --git a/fixtures/traversal-app/source/sub/sub3/deep.html.erb b/middleman-core/fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/sub/sub3/deep.html.erb
rename to middleman-core/fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb
diff --git a/fixtures/traversal-app/source/sub/index.html.erb b/middleman-core/fixtures/traversal-app/source/index.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/sub/index.html.erb
rename to middleman-core/fixtures/traversal-app/source/index.html.erb
diff --git a/fixtures/traversal-app/source/layout.erb b/middleman-core/fixtures/traversal-app/source/layout.erb
similarity index 100%
rename from fixtures/traversal-app/source/layout.erb
rename to middleman-core/fixtures/traversal-app/source/layout.erb
diff --git a/fixtures/traversal-app/source/proxied.html.erb b/middleman-core/fixtures/traversal-app/source/proxied.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/proxied.html.erb
rename to middleman-core/fixtures/traversal-app/source/proxied.html.erb
diff --git a/fixtures/traversal-app/source/root.html.erb b/middleman-core/fixtures/traversal-app/source/root.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/root.html.erb
rename to middleman-core/fixtures/traversal-app/source/root.html.erb
diff --git a/fixtures/traversal-app/source/sub/sub2/index.html.erb b/middleman-core/fixtures/traversal-app/source/sub/index.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/sub/sub2/index.html.erb
rename to middleman-core/fixtures/traversal-app/source/sub/index.html.erb
diff --git a/fixtures/traversal-app/source/sub/sibling.html.erb b/middleman-core/fixtures/traversal-app/source/sub/sibling.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/sub/sibling.html.erb
rename to middleman-core/fixtures/traversal-app/source/sub/sibling.html.erb
diff --git a/fixtures/traversal-app/source/sub/sibling2.html.erb b/middleman-core/fixtures/traversal-app/source/sub/sibling2.html.erb
similarity index 100%
rename from fixtures/traversal-app/source/sub/sibling2.html.erb
rename to middleman-core/fixtures/traversal-app/source/sub/sibling2.html.erb
diff --git a/lib/middleman/templates/mobile/source/js/script.js b/middleman-core/fixtures/traversal-app/source/sub/sub2/index.html.erb
old mode 100755
new mode 100644
similarity index 100%
rename from lib/middleman/templates/mobile/source/js/script.js
rename to middleman-core/fixtures/traversal-app/source/sub/sub2/index.html.erb
diff --git a/middleman-core/fixtures/traversal-app/source/sub/sub3/deep.html.erb b/middleman-core/fixtures/traversal-app/source/sub/sub3/deep.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/fixtures/wildcard-app/config.rb b/middleman-core/fixtures/wildcard-app/config.rb
similarity index 100%
rename from fixtures/wildcard-app/config.rb
rename to middleman-core/fixtures/wildcard-app/config.rb
diff --git a/fixtures/wildcard-app/source/admin/index.html.erb b/middleman-core/fixtures/wildcard-app/source/admin/index.html.erb
similarity index 100%
rename from fixtures/wildcard-app/source/admin/index.html.erb
rename to middleman-core/fixtures/wildcard-app/source/admin/index.html.erb
diff --git a/fixtures/wildcard-app/source/admin/page.html.erb b/middleman-core/fixtures/wildcard-app/source/admin/page.html.erb
similarity index 100%
rename from fixtures/wildcard-app/source/admin/page.html.erb
rename to middleman-core/fixtures/wildcard-app/source/admin/page.html.erb
diff --git a/fixtures/wildcard-app/source/index.html.erb b/middleman-core/fixtures/wildcard-app/source/index.html.erb
similarity index 100%
rename from fixtures/wildcard-app/source/index.html.erb
rename to middleman-core/fixtures/wildcard-app/source/index.html.erb
diff --git a/fixtures/wildcard-app/source/layouts/admin.erb b/middleman-core/fixtures/wildcard-app/source/layouts/admin.erb
similarity index 100%
rename from fixtures/wildcard-app/source/layouts/admin.erb
rename to middleman-core/fixtures/wildcard-app/source/layouts/admin.erb
diff --git a/fixtures/wildcard-app/source/layouts/layout.erb b/middleman-core/fixtures/wildcard-app/source/layouts/layout.erb
similarity index 100%
rename from fixtures/wildcard-app/source/layouts/layout.erb
rename to middleman-core/fixtures/wildcard-app/source/layouts/layout.erb
diff --git a/fixtures/wildcard-directory-index-app/config.rb b/middleman-core/fixtures/wildcard-directory-index-app/config.rb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/config.rb
rename to middleman-core/fixtures/wildcard-directory-index-app/config.rb
diff --git a/fixtures/wildcard-directory-index-app/source/admin/index.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/admin/index.html.erb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/source/admin/index.html.erb
rename to middleman-core/fixtures/wildcard-directory-index-app/source/admin/index.html.erb
diff --git a/fixtures/wildcard-directory-index-app/source/admin/page.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/admin/page.html.erb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/source/admin/page.html.erb
rename to middleman-core/fixtures/wildcard-directory-index-app/source/admin/page.html.erb
diff --git a/fixtures/wildcard-directory-index-app/source/index.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/index.html.erb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/source/index.html.erb
rename to middleman-core/fixtures/wildcard-directory-index-app/source/index.html.erb
diff --git a/fixtures/wildcard-directory-index-app/source/layouts/admin.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/layouts/admin.erb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/source/layouts/admin.erb
rename to middleman-core/fixtures/wildcard-directory-index-app/source/layouts/admin.erb
diff --git a/fixtures/wildcard-directory-index-app/source/layouts/layout.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/layouts/layout.erb
similarity index 100%
rename from fixtures/wildcard-directory-index-app/source/layouts/layout.erb
rename to middleman-core/fixtures/wildcard-directory-index-app/source/layouts/layout.erb
diff --git a/lib/middleman.rb b/middleman-core/lib/middleman-core.rb
similarity index 59%
rename from lib/middleman.rb
rename to middleman-core/lib/middleman-core.rb
index dc4a531e..b9933088 100755
--- a/lib/middleman.rb
+++ b/middleman-core/lib/middleman-core.rb
@@ -3,117 +3,96 @@ require "rbconfig"
 # Using Thor's indifferent hash access
 require "thor"
 
+require "active_support"
+
 # Setup our load paths
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+class String
+  def camelize
+    self.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+  end
+end
+
+# Simple callback library
+require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
+
 # Top-level Middleman object
 module Middleman
   WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
   JRUBY   = !!(RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /^jruby/i)
   
   # Auto-load modules on-demand
-  autoload :Base,           "middleman/base"
-  autoload :Cache,          "middleman/cache"
-  autoload :Templates,      "middleman/templates"
-  autoload :Guard,          "middleman/guard"
+  autoload :Base,           "middleman-core/base"
+  autoload :Cache,          "middleman-core/cache"
+  autoload :Templates,      "middleman-core/templates"
+  autoload :Guard,          "middleman-core/guard"
   
   module Cli
-    autoload :Base,         "middleman/cli"
-    autoload :Build,        "middleman/cli/build"
-    autoload :Init,         "middleman/cli/init"
-    autoload :Server,       "middleman/cli/server"
+    autoload :Base,         "middleman-core/cli"
+    autoload :Build,        "middleman-core/cli/build"
+    autoload :Init,         "middleman-core/cli/init"
+    autoload :Server,       "middleman-core/cli/server"
   end
   
   # Custom Renderers
   module Renderers
-    autoload :Haml,         "middleman/renderers/haml"
-    autoload :Sass,         "middleman/renderers/sass"
-    autoload :Markdown,     "middleman/renderers/markdown"
-    autoload :ERb,          "middleman/renderers/erb"
-    autoload :Liquid,       "middleman/renderers/liquid"
+    autoload :ERb,          "middleman-core/renderers/erb"
   end
   
   module Sitemap
-    autoload :Store,        "middleman/sitemap/store"
-    autoload :Page,         "middleman/sitemap/page"
-    autoload :Template,     "middleman/sitemap/template"
+    autoload :Store,        "middleman-core/sitemap/store"
+    autoload :Page,         "middleman-core/sitemap/page"
+    autoload :Template,     "middleman-core/sitemap/template"
   end
   
   module CoreExtensions
     # File Change Notifier
-    autoload :FileWatcher,   "middleman/core_extensions/file_watcher"
+    autoload :FileWatcher,    "middleman-core/core_extensions/file_watcher"
     
     # In-memory Sitemap
-    autoload :Sitemap,       "middleman/core_extensions/sitemap"
+    autoload :Sitemap,        "middleman-core/core_extensions/sitemap"
     
     # Add Builder callbacks
-    autoload :Builder,       "middleman/core_extensions/builder"
+    autoload :Builder,        "middleman-core/core_extensions/builder"
     
     # Custom Feature API
-    autoload :Extensions,    "middleman/core_extensions/extensions"
+    autoload :Extensions,     "middleman-core/core_extensions/extensions"
   
     # Asset Path Pipeline
-    autoload :Assets,        "middleman/core_extensions/assets"
-  
-    # DefaultHelpers are the built-in dynamic template helpers.
-    autoload :DefaultHelpers, "middleman/core_extensions/default_helpers"
+    autoload :Assets,         "middleman-core/core_extensions/assets"
   
     # Data looks at the data/ folder for YAML files and makes them available
     # to dynamic requests.
-    autoload :Data,           "middleman/core_extensions/data"
+    autoload :Data,           "middleman-core/core_extensions/data"
     
     # Parse YAML from templates
-    autoload :FrontMatter,    "middleman/core_extensions/front_matter"
+    autoload :FrontMatter,    "middleman-core/core_extensions/front_matter"
     
+    # DefaultHelpers are the built-in dynamic template helpers.
+    autoload :DefaultHelpers, "middleman-core/core_extensions/default_helpers"
+
     # Extended version of Padrino's rendering
-    autoload :Rendering,      "middleman/core_extensions/rendering"
+    autoload :Rendering,      "middleman-core/core_extensions/rendering"
     
-    # Compass framework for Sass
-    autoload :Compass,        "middleman/core_extensions/compass"
-    
-    # Sprockets 2
-    autoload :Sprockets,      "middleman/core_extensions/sprockets"
-  
     # Pass custom options to views
-    autoload :Routing,        "middleman/core_extensions/routing"
+    autoload :Routing,        "middleman-core/core_extensions/routing"
     
     # Catch and show exceptions at the Rack level
-    autoload :ShowExceptions, "middleman/core_extensions/show_exceptions"
+    autoload :ShowExceptions, "middleman-core/core_extensions/show_exceptions"
   end
-
+  
   module Extensions
-    # RelativeAssets allow any asset path in dynamic templates to be either
-    # relative to the root of the project or use an absolute URL.
-    autoload :RelativeAssets,      "middleman/extensions/relative_assets"
-
-    # AssetHost allows you to setup multiple domains to host your static
-    # assets. Calls to asset paths in dynamic templates will then rotate
-    # through each of the asset servers to better spread the load.
-    autoload :AssetHost,           "middleman/extensions/asset_host"
-
-    # CacheBuster adds a query string to assets in dynamic templates to avoid
-    # browser caches failing to update to your new content.
-    autoload :CacheBuster,         "middleman/extensions/cache_buster"
-
-    # AutomaticImageSizes inspects the images used in your dynamic templates
-    # and automatically adds width and height attributes to their HTML
-    # elements.
-    autoload :AutomaticImageSizes, "middleman/extensions/automatic_image_sizes"
-
-    # MinifyCss uses the YUI compressor to shrink CSS files
-    autoload :MinifyCss,           "middleman/extensions/minify_css"
-
-    # MinifyJavascript uses the YUI compressor to shrink JS files
-    autoload :MinifyJavascript,    "middleman/extensions/minify_javascript"
+    # Provide Apache-style index.html files for directories
+    autoload :DirectoryIndexes, "middleman-core/extensions/directory_indexes"
 
     # Lorem provides a handful of helpful prototyping methods to generate
     # words, paragraphs, fake images, names and email addresses.
-    autoload :Lorem,               "middleman/extensions/lorem"
-    
-    # Automatically convert filename.html files into filename/index.html
-    autoload :DirectoryIndexes,    "middleman/extensions/directory_indexes"
-    
+    autoload :Lorem,            "middleman-core/extensions/lorem"
+  end
+  
+  module Extensions  
     class << self
       def registered
         @_registered ||= {}
@@ -138,7 +117,7 @@ module Middleman
         end
 
         registered[name.to_sym] = if !passed_version_check
-          "== #{name} failed version check. Requested #{version}, got #{Middleman::VERSION}"
+          "== #{name} failed version check. Requested #{version}, got #{Middleman::Core::VERSION}"
         elsif block_given?
           block
         elsif namespace
@@ -252,19 +231,14 @@ module Middleman
       app_class = options[:app] ||= ::Middleman.server.inst
       opts[:app] = app_class
     
-      require "thin"
-      ::Thin::Logging.silent = !options[:logging]
-      opts[:server] = 'thin'
+      # Disable for Beta 1. See if people notice.
+      # require "thin"
+      # ::Thin::Logging.silent = !options[:logging]
+      # opts[:server] = 'thin'
       
       server = ::Rack::Server.new(opts)
       server.start
       server
     end
   end
-end
-
-# Make the VERSION string available
-require "middleman/version"
-
-# Automatically discover extensions in RubyGems
-Middleman.load_extensions_in_path
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/lib/middleman/base.rb b/middleman-core/lib/middleman-core/base.rb
similarity index 92%
rename from lib/middleman/base.rb
rename to middleman-core/lib/middleman-core/base.rb
index 236136a2..25861626 100644
--- a/lib/middleman/base.rb
+++ b/middleman-core/lib/middleman-core/base.rb
@@ -5,13 +5,8 @@ require "rack/file"
 # Using Tilt for templating
 require "tilt"
 
-# Simple callback library
-require "middleman/vendor/hooks-0.2.0/lib/hooks"
-
-# Use ActiveSupport JSON and Inflections
-require "active_support"
+# Use ActiveSupport JSON
 require "active_support/json"
-require "active_support/core_ext/string/inflections"
   
 # Core Middleman Class
 class Middleman::Base
@@ -203,9 +198,7 @@ class Middleman::Base
 
   # Automatically loaded extensions
   # @return [Array<Symbol>]
-  set :default_extensions, [
-    :lorem
-  ]
+  set :default_extensions, [:lorem]
 
   # Default layout name
   # @return [String, Symbold]
@@ -232,18 +225,12 @@ class Middleman::Base
   # Sitemap
   register Middleman::CoreExtensions::Sitemap
   
-  # Compass framework
-  register Middleman::CoreExtensions::Compass
-
-  # Sprockets asset handling
-  register Middleman::CoreExtensions::Sprockets
+  # Setup default helpers
+  register Middleman::CoreExtensions::DefaultHelpers
   
   # Setup asset path pipeline
   register Middleman::CoreExtensions::Assets
   
-  # Activate built-in helpers
-  register Middleman::CoreExtensions::DefaultHelpers
-  
   # with_layout and page routing
   register Middleman::CoreExtensions::Routing
   
@@ -251,22 +238,10 @@ class Middleman::Base
   register Middleman::CoreExtensions::FrontMatter
   
   # Built-in Extensions
-  Middleman::Extensions.register(:asset_host) { 
-    Middleman::Extensions::AssetHost }
-  Middleman::Extensions.register(:automatic_image_sizes) {
-    Middleman::Extensions::AutomaticImageSizes }
-  Middleman::Extensions.register(:cache_buster) { 
-    Middleman::Extensions::CacheBuster }
   Middleman::Extensions.register(:directory_indexes) {
     Middleman::Extensions::DirectoryIndexes }
-  Middleman::Extensions.register(:lorem) { 
+  Middleman::Extensions.register(:lorem) {
     Middleman::Extensions::Lorem }
-  Middleman::Extensions.register(:minify_css) { 
-    Middleman::Extensions::MinifyCss }
-  Middleman::Extensions.register(:minify_javascript) {
-    Middleman::Extensions::MinifyJavascript }
-  Middleman::Extensions.register(:relative_assets) {
-    Middleman::Extensions::RelativeAssets }
   
   # Backwards-compatibility with old request.path signature
   attr :request
diff --git a/lib/middleman/cache.rb b/middleman-core/lib/middleman-core/cache.rb
similarity index 100%
rename from lib/middleman/cache.rb
rename to middleman-core/lib/middleman-core/cache.rb
diff --git a/lib/middleman/cli.rb b/middleman-core/lib/middleman-core/cli.rb
similarity index 88%
rename from lib/middleman/cli.rb
rename to middleman-core/lib/middleman-core/cli.rb
index 78450e36..04ada583 100644
--- a/lib/middleman/cli.rb
+++ b/middleman-core/lib/middleman-core/cli.rb
@@ -10,8 +10,8 @@ module Middleman::Cli
     
     desc "version", "Show version"
     def version
-      require 'middleman/version'
-      say "Middleman #{Middleman::VERSION}"
+      require 'middleman-core/version'
+      say "Middleman #{Middleman::Core::VERSION}"
     end
     
     # Override the Thor help method to find help for subtasks
@@ -52,6 +52,6 @@ module Middleman::Cli
 end
 
 # Include the core CLI items
-require "middleman/cli/init"
-require "middleman/cli/server"
-require "middleman/cli/build"
\ No newline at end of file
+require "middleman-core/cli/init"
+require "middleman-core/cli/server"
+require "middleman-core/cli/build"
\ No newline at end of file
diff --git a/lib/middleman/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
similarity index 100%
rename from lib/middleman/cli/build.rb
rename to middleman-core/lib/middleman-core/cli/build.rb
diff --git a/lib/middleman/cli/init.rb b/middleman-core/lib/middleman-core/cli/init.rb
similarity index 100%
rename from lib/middleman/cli/init.rb
rename to middleman-core/lib/middleman-core/cli/init.rb
diff --git a/lib/middleman/cli/server.rb b/middleman-core/lib/middleman-core/cli/server.rb
similarity index 100%
rename from lib/middleman/cli/server.rb
rename to middleman-core/lib/middleman-core/cli/server.rb
diff --git a/lib/middleman/core_extensions/assets.rb b/middleman-core/lib/middleman-core/core_extensions/assets.rb
similarity index 100%
rename from lib/middleman/core_extensions/assets.rb
rename to middleman-core/lib/middleman-core/core_extensions/assets.rb
diff --git a/lib/middleman/core_extensions/builder.rb b/middleman-core/lib/middleman-core/core_extensions/builder.rb
similarity index 100%
rename from lib/middleman/core_extensions/builder.rb
rename to middleman-core/lib/middleman-core/core_extensions/builder.rb
diff --git a/lib/middleman/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
similarity index 100%
rename from lib/middleman/core_extensions/data.rb
rename to middleman-core/lib/middleman-core/core_extensions/data.rb
diff --git a/lib/middleman/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
similarity index 91%
rename from lib/middleman/core_extensions/default_helpers.rb
rename to middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
index cc5f1a6a..2a7df53a 100644
--- a/lib/middleman/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
@@ -1,11 +1,11 @@
-require "middleman/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite"
-require 'i18n'
+require "middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite"
+# require 'i18n'
 require 'enumerator'
-require 'active_support/core_ext/string/conversions'  # to_date
+# require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/core_ext/float/rounding'      # round
 require 'active_support/option_merger'                # with_options
 require 'active_support/core_ext/object/with_options' # with_options
-require 'active_support/inflector'                    # humanize
+# require 'active_support/inflector'                    # humanize
 
 FileSet.glob_require('../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/**/*.rb', __FILE__)
 
@@ -27,9 +27,9 @@ module Middleman::CoreExtensions::DefaultHelpers
       
       app.helpers Helpers
       
-      app.ready do
-        ::I18n.load_path = Dir["#{File.join(root, 'locales', '*.yml')}"]
-      end
+      # app.ready do
+      #   ::I18n.load_path = Dir["#{File.join(root, 'locales', '*.yml')}"]
+      # end
     end
     alias :included :registered
   end
diff --git a/lib/middleman/core_extensions/extensions.rb b/middleman-core/lib/middleman-core/core_extensions/extensions.rb
similarity index 100%
rename from lib/middleman/core_extensions/extensions.rb
rename to middleman-core/lib/middleman-core/core_extensions/extensions.rb
diff --git a/lib/middleman/core_extensions/file_watcher.rb b/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
similarity index 100%
rename from lib/middleman/core_extensions/file_watcher.rb
rename to middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
diff --git a/lib/middleman/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
similarity index 100%
rename from lib/middleman/core_extensions/front_matter.rb
rename to middleman-core/lib/middleman-core/core_extensions/front_matter.rb
diff --git a/lib/middleman/core_extensions/rendering.rb b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
similarity index 95%
rename from lib/middleman/core_extensions/rendering.rb
rename to middleman-core/lib/middleman-core/core_extensions/rendering.rb
index 9852bf41..954eff19 100644
--- a/lib/middleman/core_extensions/rendering.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/rendering.rb
@@ -1,22 +1,10 @@
 module Middleman::CoreExtensions::Rendering
   class << self
     def registered(app)
-      # Autoload
-      require "coffee_script"
-      
       app.send :include, InstanceMethods
       
       # Activate custom renderers
-      app.register Middleman::Renderers::Haml
-      app.register Middleman::Renderers::Sass
-      app.register Middleman::Renderers::Markdown
       app.register Middleman::Renderers::ERb
-      app.register Middleman::Renderers::Liquid
-      
-      begin
-        require "slim"
-      rescue LoadError
-      end
     end
     alias :included :registered
   end
diff --git a/lib/middleman/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb
similarity index 100%
rename from lib/middleman/core_extensions/routing.rb
rename to middleman-core/lib/middleman-core/core_extensions/routing.rb
diff --git a/lib/middleman/core_extensions/show_exceptions.rb b/middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb
similarity index 100%
rename from lib/middleman/core_extensions/show_exceptions.rb
rename to middleman-core/lib/middleman-core/core_extensions/show_exceptions.rb
diff --git a/lib/middleman/core_extensions/sitemap.rb b/middleman-core/lib/middleman-core/core_extensions/sitemap.rb
similarity index 100%
rename from lib/middleman/core_extensions/sitemap.rb
rename to middleman-core/lib/middleman-core/core_extensions/sitemap.rb
diff --git a/lib/middleman/extensions/directory_indexes.rb b/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
similarity index 100%
rename from lib/middleman/extensions/directory_indexes.rb
rename to middleman-core/lib/middleman-core/extensions/directory_indexes.rb
diff --git a/lib/middleman/extensions/lorem.rb b/middleman-core/lib/middleman-core/extensions/lorem.rb
similarity index 100%
rename from lib/middleman/extensions/lorem.rb
rename to middleman-core/lib/middleman-core/extensions/lorem.rb
diff --git a/lib/middleman/guard.rb b/middleman-core/lib/middleman-core/guard.rb
similarity index 100%
rename from lib/middleman/guard.rb
rename to middleman-core/lib/middleman-core/guard.rb
diff --git a/lib/middleman/renderers/erb.rb b/middleman-core/lib/middleman-core/renderers/erb.rb
similarity index 100%
rename from lib/middleman/renderers/erb.rb
rename to middleman-core/lib/middleman-core/renderers/erb.rb
diff --git a/lib/middleman/sitemap/page.rb b/middleman-core/lib/middleman-core/sitemap/page.rb
similarity index 100%
rename from lib/middleman/sitemap/page.rb
rename to middleman-core/lib/middleman-core/sitemap/page.rb
diff --git a/lib/middleman/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
similarity index 100%
rename from lib/middleman/sitemap/store.rb
rename to middleman-core/lib/middleman-core/sitemap/store.rb
diff --git a/lib/middleman/sitemap/template.rb b/middleman-core/lib/middleman-core/sitemap/template.rb
similarity index 100%
rename from lib/middleman/sitemap/template.rb
rename to middleman-core/lib/middleman-core/sitemap/template.rb
diff --git a/lib/middleman/step_definitions.rb b/middleman-core/lib/middleman-core/step_definitions.rb
similarity index 62%
rename from lib/middleman/step_definitions.rb
rename to middleman-core/lib/middleman-core/step_definitions.rb
index acc1eb16..7b2abcd0 100644
--- a/lib/middleman/step_definitions.rb
+++ b/middleman-core/lib/middleman-core/step_definitions.rb
@@ -3,9 +3,9 @@ MIDDLEMAN_BIN_PATH  = File.join(MIDDLEMAN_ROOT_PATH, "bin")
 ENV['PATH'] = "#{MIDDLEMAN_BIN_PATH}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 require "aruba/cucumber"
-require "middleman/step_definitions/middleman_steps"
-require "middleman/step_definitions/builder_steps"
-require "middleman/step_definitions/server_steps"
+require "middleman-core/step_definitions/middleman_steps"
+require "middleman-core/step_definitions/builder_steps"
+require "middleman-core/step_definitions/server_steps"
 
 Before do
   @aruba_timeout_seconds = 30
diff --git a/lib/middleman/step_definitions/builder_steps.rb b/middleman-core/lib/middleman-core/step_definitions/builder_steps.rb
similarity index 100%
rename from lib/middleman/step_definitions/builder_steps.rb
rename to middleman-core/lib/middleman-core/step_definitions/builder_steps.rb
diff --git a/lib/middleman/step_definitions/middleman_steps.rb b/middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb
similarity index 100%
rename from lib/middleman/step_definitions/middleman_steps.rb
rename to middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb
diff --git a/lib/middleman/step_definitions/server_steps.rb b/middleman-core/lib/middleman-core/step_definitions/server_steps.rb
similarity index 100%
rename from lib/middleman/step_definitions/server_steps.rb
rename to middleman-core/lib/middleman-core/step_definitions/server_steps.rb
diff --git a/lib/middleman/templates.rb b/middleman-core/lib/middleman-core/templates.rb
similarity index 93%
rename from lib/middleman/templates.rb
rename to middleman-core/lib/middleman-core/templates.rb
index 0433312a..6d932b5f 100644
--- a/lib/middleman/templates.rb
+++ b/middleman-core/lib/middleman-core/templates.rb
@@ -70,13 +70,13 @@ module Middleman::Templates
 end
 
 # Default template
-require "middleman/templates/default"
+require "middleman-core/templates/default"
 
 # HTML5 template
-require "middleman/templates/html5"
+require "middleman-core/templates/html5"
 
 # HTML5 Mobile template
-require "middleman/templates/mobile"
+require "middleman-core/templates/mobile"
 
 # Local templates
-require "middleman/templates/local"
\ No newline at end of file
+require "middleman-core/templates/local"
\ No newline at end of file
diff --git a/lib/middleman/templates/default.rb b/middleman-core/lib/middleman-core/templates/default.rb
similarity index 100%
rename from lib/middleman/templates/default.rb
rename to middleman-core/lib/middleman-core/templates/default.rb
diff --git a/lib/middleman/templates/default/source/images/background.png b/middleman-core/lib/middleman-core/templates/default/source/images/background.png
similarity index 100%
rename from lib/middleman/templates/default/source/images/background.png
rename to middleman-core/lib/middleman-core/templates/default/source/images/background.png
diff --git a/lib/middleman/templates/default/source/images/middleman.png b/middleman-core/lib/middleman-core/templates/default/source/images/middleman.png
similarity index 100%
rename from lib/middleman/templates/default/source/images/middleman.png
rename to middleman-core/lib/middleman-core/templates/default/source/images/middleman.png
diff --git a/middleman-core/lib/middleman-core/templates/default/source/index.html.erb b/middleman-core/lib/middleman-core/templates/default/source/index.html.erb
new file mode 100644
index 00000000..7537cd68
--- /dev/null
+++ b/middleman-core/lib/middleman-core/templates/default/source/index.html.erb
@@ -0,0 +1,10 @@
+---
+title: Welcome to Middleman
+---
+
+<div class="welcome">
+  <h1>Middleman is Watching</h1>
+  <p class="doc">
+    <%= link_to "Read Online Documentation", "http://middlemanapp.com/" %>
+  </p><!-- .doc -->
+</div><!-- .welcome -->
\ No newline at end of file
diff --git a/lib/middleman/templates/default/source/javascripts/all.js b/middleman-core/lib/middleman-core/templates/default/source/javascripts/all.js
similarity index 100%
rename from lib/middleman/templates/default/source/javascripts/all.js
rename to middleman-core/lib/middleman-core/templates/default/source/javascripts/all.js
diff --git a/lib/middleman/templates/default/source/layouts/layout.erb b/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
similarity index 100%
rename from lib/middleman/templates/default/source/layouts/layout.erb
rename to middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
diff --git a/lib/middleman/templates/default/source/stylesheets/_animate.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss
similarity index 100%
rename from lib/middleman/templates/default/source/stylesheets/_animate.scss
rename to middleman-core/lib/middleman-core/templates/default/source/stylesheets/_animate.scss
diff --git a/lib/middleman/templates/default/source/stylesheets/_normalize.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/_normalize.scss
similarity index 100%
rename from lib/middleman/templates/default/source/stylesheets/_normalize.scss
rename to middleman-core/lib/middleman-core/templates/default/source/stylesheets/_normalize.scss
diff --git a/lib/middleman/templates/default/source/stylesheets/all.css.scss b/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss
similarity index 100%
rename from lib/middleman/templates/default/source/stylesheets/all.css.scss
rename to middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css.scss
diff --git a/lib/middleman/templates/html5.rb b/middleman-core/lib/middleman-core/templates/html5.rb
similarity index 100%
rename from lib/middleman/templates/html5.rb
rename to middleman-core/lib/middleman-core/templates/html5.rb
diff --git a/lib/middleman/templates/html5/source/404.html b/middleman-core/lib/middleman-core/templates/html5/source/404.html
similarity index 100%
rename from lib/middleman/templates/html5/source/404.html
rename to middleman-core/lib/middleman-core/templates/html5/source/404.html
diff --git a/lib/middleman/templates/html5/source/README.md b/middleman-core/lib/middleman-core/templates/html5/source/README.md
similarity index 100%
rename from lib/middleman/templates/html5/source/README.md
rename to middleman-core/lib/middleman-core/templates/html5/source/README.md
diff --git a/lib/middleman/templates/html5/source/apple-touch-icon-114x114-precomposed.png b/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png
similarity index 100%
rename from lib/middleman/templates/html5/source/apple-touch-icon-114x114-precomposed.png
rename to middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png
diff --git a/lib/middleman/templates/html5/source/apple-touch-icon-57x57-precomposed.png b/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png
similarity index 100%
rename from lib/middleman/templates/html5/source/apple-touch-icon-57x57-precomposed.png
rename to middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png
diff --git a/lib/middleman/templates/html5/source/apple-touch-icon-72x72-precomposed.png b/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png
similarity index 100%
rename from lib/middleman/templates/html5/source/apple-touch-icon-72x72-precomposed.png
rename to middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png
diff --git a/lib/middleman/templates/html5/source/apple-touch-icon-precomposed.png b/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png
similarity index 100%
rename from lib/middleman/templates/html5/source/apple-touch-icon-precomposed.png
rename to middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png
diff --git a/lib/middleman/templates/html5/source/apple-touch-icon.png b/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon.png
similarity index 100%
rename from lib/middleman/templates/html5/source/apple-touch-icon.png
rename to middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon.png
diff --git a/lib/middleman/templates/html5/source/crossdomain.xml b/middleman-core/lib/middleman-core/templates/html5/source/crossdomain.xml
similarity index 100%
rename from lib/middleman/templates/html5/source/crossdomain.xml
rename to middleman-core/lib/middleman-core/templates/html5/source/crossdomain.xml
diff --git a/lib/middleman/templates/html5/source/css/style.css b/middleman-core/lib/middleman-core/templates/html5/source/css/style.css
similarity index 100%
rename from lib/middleman/templates/html5/source/css/style.css
rename to middleman-core/lib/middleman-core/templates/html5/source/css/style.css
diff --git a/lib/middleman/templates/html5/source/favicon.ico b/middleman-core/lib/middleman-core/templates/html5/source/favicon.ico
similarity index 100%
rename from lib/middleman/templates/html5/source/favicon.ico
rename to middleman-core/lib/middleman-core/templates/html5/source/favicon.ico
diff --git a/lib/middleman/templates/html5/source/humans.txt b/middleman-core/lib/middleman-core/templates/html5/source/humans.txt
similarity index 100%
rename from lib/middleman/templates/html5/source/humans.txt
rename to middleman-core/lib/middleman-core/templates/html5/source/humans.txt
diff --git a/lib/middleman/templates/html5/source/img/.gitignore b/middleman-core/lib/middleman-core/templates/html5/source/img/.gitignore
similarity index 100%
rename from lib/middleman/templates/html5/source/img/.gitignore
rename to middleman-core/lib/middleman-core/templates/html5/source/img/.gitignore
diff --git a/lib/middleman/templates/html5/source/index.html b/middleman-core/lib/middleman-core/templates/html5/source/index.html
similarity index 100%
rename from lib/middleman/templates/html5/source/index.html
rename to middleman-core/lib/middleman-core/templates/html5/source/index.html
diff --git a/lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.js b/middleman-core/lib/middleman-core/templates/html5/source/js/libs/jquery-1.6.2.js
similarity index 100%
rename from lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.js
rename to middleman-core/lib/middleman-core/templates/html5/source/js/libs/jquery-1.6.2.js
diff --git a/lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.min.js b/middleman-core/lib/middleman-core/templates/html5/source/js/libs/jquery-1.6.2.min.js
similarity index 100%
rename from lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.min.js
rename to middleman-core/lib/middleman-core/templates/html5/source/js/libs/jquery-1.6.2.min.js
diff --git a/lib/middleman/templates/html5/source/js/libs/modernizr-2.0.6.min.js b/middleman-core/lib/middleman-core/templates/html5/source/js/libs/modernizr-2.0.6.min.js
similarity index 100%
rename from lib/middleman/templates/html5/source/js/libs/modernizr-2.0.6.min.js
rename to middleman-core/lib/middleman-core/templates/html5/source/js/libs/modernizr-2.0.6.min.js
diff --git a/lib/middleman/templates/html5/source/js/mylibs/.gitignore b/middleman-core/lib/middleman-core/templates/html5/source/js/mylibs/.gitignore
similarity index 100%
rename from lib/middleman/templates/html5/source/js/mylibs/.gitignore
rename to middleman-core/lib/middleman-core/templates/html5/source/js/mylibs/.gitignore
diff --git a/lib/middleman/templates/html5/source/js/plugins.js b/middleman-core/lib/middleman-core/templates/html5/source/js/plugins.js
similarity index 100%
rename from lib/middleman/templates/html5/source/js/plugins.js
rename to middleman-core/lib/middleman-core/templates/html5/source/js/plugins.js
diff --git a/lib/middleman/templates/html5/source/js/script.js b/middleman-core/lib/middleman-core/templates/html5/source/js/script.js
similarity index 100%
rename from lib/middleman/templates/html5/source/js/script.js
rename to middleman-core/lib/middleman-core/templates/html5/source/js/script.js
diff --git a/lib/middleman/templates/html5/source/robots.txt b/middleman-core/lib/middleman-core/templates/html5/source/robots.txt
similarity index 100%
rename from lib/middleman/templates/html5/source/robots.txt
rename to middleman-core/lib/middleman-core/templates/html5/source/robots.txt
diff --git a/lib/middleman/templates/html5/source/test/index.html b/middleman-core/lib/middleman-core/templates/html5/source/test/index.html
similarity index 100%
rename from lib/middleman/templates/html5/source/test/index.html
rename to middleman-core/lib/middleman-core/templates/html5/source/test/index.html
diff --git a/lib/middleman/templates/html5/source/test/qunit/qunit.css b/middleman-core/lib/middleman-core/templates/html5/source/test/qunit/qunit.css
similarity index 100%
rename from lib/middleman/templates/html5/source/test/qunit/qunit.css
rename to middleman-core/lib/middleman-core/templates/html5/source/test/qunit/qunit.css
diff --git a/lib/middleman/templates/html5/source/test/qunit/qunit.js b/middleman-core/lib/middleman-core/templates/html5/source/test/qunit/qunit.js
similarity index 100%
rename from lib/middleman/templates/html5/source/test/qunit/qunit.js
rename to middleman-core/lib/middleman-core/templates/html5/source/test/qunit/qunit.js
diff --git a/lib/middleman/templates/html5/source/test/tests.js b/middleman-core/lib/middleman-core/templates/html5/source/test/tests.js
similarity index 100%
rename from lib/middleman/templates/html5/source/test/tests.js
rename to middleman-core/lib/middleman-core/templates/html5/source/test/tests.js
diff --git a/lib/middleman/templates/local.rb b/middleman-core/lib/middleman-core/templates/local.rb
similarity index 100%
rename from lib/middleman/templates/local.rb
rename to middleman-core/lib/middleman-core/templates/local.rb
diff --git a/lib/middleman/templates/mobile.rb b/middleman-core/lib/middleman-core/templates/mobile.rb
similarity index 100%
rename from lib/middleman/templates/mobile.rb
rename to middleman-core/lib/middleman-core/templates/mobile.rb
diff --git a/lib/middleman/templates/mobile/source/404.html b/middleman-core/lib/middleman-core/templates/mobile/source/404.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/404.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/404.html
diff --git a/lib/middleman/templates/mobile/source/README.markdown b/middleman-core/lib/middleman-core/templates/mobile/source/README.markdown
similarity index 100%
rename from lib/middleman/templates/mobile/source/README.markdown
rename to middleman-core/lib/middleman-core/templates/mobile/source/README.markdown
diff --git a/lib/middleman/templates/mobile/source/crossdomain.xml b/middleman-core/lib/middleman-core/templates/mobile/source/crossdomain.xml
similarity index 100%
rename from lib/middleman/templates/mobile/source/crossdomain.xml
rename to middleman-core/lib/middleman-core/templates/mobile/source/crossdomain.xml
diff --git a/lib/middleman/templates/mobile/source/css/style.css b/middleman-core/lib/middleman-core/templates/mobile/source/css/style.css
similarity index 100%
rename from lib/middleman/templates/mobile/source/css/style.css
rename to middleman-core/lib/middleman-core/templates/mobile/source/css/style.css
diff --git a/lib/middleman/templates/mobile/source/humans.txt b/middleman-core/lib/middleman-core/templates/mobile/source/humans.txt
similarity index 100%
rename from lib/middleman/templates/mobile/source/humans.txt
rename to middleman-core/lib/middleman-core/templates/mobile/source/humans.txt
diff --git a/lib/middleman/templates/mobile/source/img/h/apple-touch-icon.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/h/apple-touch-icon.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png
diff --git a/lib/middleman/templates/mobile/source/img/h/splash.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/h/splash.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/h/splash.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/h/splash.png
diff --git a/lib/middleman/templates/mobile/source/img/l/apple-touch-icon-precomposed.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
diff --git a/lib/middleman/templates/mobile/source/img/l/apple-touch-icon.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/l/apple-touch-icon.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png
diff --git a/lib/middleman/templates/mobile/source/img/l/splash.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/l/splash.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/l/splash.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/l/splash.png
diff --git a/lib/middleman/templates/mobile/source/img/m/apple-touch-icon.png b/middleman-core/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/img/m/apple-touch-icon.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png
diff --git a/lib/middleman/templates/mobile/source/index.html b/middleman-core/lib/middleman-core/templates/mobile/source/index.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/index.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/index.html
diff --git a/lib/middleman/templates/mobile/source/js/libs/modernizr-custom.js b/middleman-core/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/js/libs/modernizr-custom.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js
diff --git a/lib/middleman/templates/mobile/source/js/libs/respond.min.js b/middleman-core/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/js/libs/respond.min.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js
diff --git a/lib/middleman/templates/mobile/source/js/mylibs/helper.js b/middleman-core/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/js/mylibs/helper.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js
diff --git a/lib/middleman/templates/mobile/source/js/plugins.js b/middleman-core/lib/middleman-core/templates/mobile/source/js/plugins.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/js/plugins.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/js/plugins.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/script.js b/middleman-core/lib/middleman-core/templates/mobile/source/js/script.js
new file mode 100755
index 00000000..e69de29b
diff --git a/lib/middleman/templates/mobile/source/robots.txt b/middleman-core/lib/middleman-core/templates/mobile/source/robots.txt
similarity index 100%
rename from lib/middleman/templates/mobile/source/robots.txt
rename to middleman-core/lib/middleman-core/templates/mobile/source/robots.txt
diff --git a/lib/middleman/templates/mobile/source/sitemap.xml b/middleman-core/lib/middleman-core/templates/mobile/source/sitemap.xml
similarity index 100%
rename from lib/middleman/templates/mobile/source/sitemap.xml
rename to middleman-core/lib/middleman-core/templates/mobile/source/sitemap.xml
diff --git a/lib/middleman/templates/mobile/source/test/index.html b/middleman-core/lib/middleman-core/templates/mobile/source/test/index.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/test/index.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/test/index.html
diff --git a/lib/middleman/templates/mobile/source/test/qunit/qunit.css b/middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css
similarity index 100%
rename from lib/middleman/templates/mobile/source/test/qunit/qunit.css
rename to middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css
diff --git a/lib/middleman/templates/mobile/source/test/qunit/qunit.js b/middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/test/qunit/qunit.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js
diff --git a/lib/middleman/templates/mobile/source/test/tests.js b/middleman-core/lib/middleman-core/templates/mobile/source/test/tests.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/test/tests.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/test/tests.js
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
diff --git a/lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl b/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
diff --git a/lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png b/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/README b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/README
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/README
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/README
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/databasefactory.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/databasefactory.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbworker.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbworker.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbworker_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbworker_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbworkerstarter.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbworkerstarter.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gears_resultset.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gears_resultset.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gears_resultset_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gears_resultset_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gears_transaction.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gears_transaction.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gears_transaction_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gears_transaction_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gearsutils.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gearsutils.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/gearsutils_test.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/gearsutils_test.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/global_functions.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/global_functions.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/index.html b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/simplenotes/index.html
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/styles.css b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/simplenotes/styles.css
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css
diff --git a/lib/middleman/templates/mobile/source/tools/wspl/simplenotes/template.js b/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js
similarity index 100%
rename from lib/middleman/templates/mobile/source/tools/wspl/simplenotes/template.js
rename to middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js
diff --git a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
new file mode 100644
index 00000000..36daa600
--- /dev/null
+++ b/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
@@ -0,0 +1,3 @@
+source :rubygems
+
+gem "middleman", "~><%= Middleman::Core::VERSION %>"
\ No newline at end of file
diff --git a/lib/middleman/templates/shared/config.ru b/middleman-core/lib/middleman-core/templates/shared/config.ru
similarity index 100%
rename from lib/middleman/templates/shared/config.ru
rename to middleman-core/lib/middleman-core/templates/shared/config.ru
diff --git a/lib/middleman/templates/shared/config.tt b/middleman-core/lib/middleman-core/templates/shared/config.tt
similarity index 100%
rename from lib/middleman/templates/shared/config.tt
rename to middleman-core/lib/middleman-core/templates/shared/config.tt
diff --git a/lib/middleman/vendor/hooks-0.2.0/CHANGES.textile b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/CHANGES.textile
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/CHANGES.textile
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/CHANGES.textile
diff --git a/lib/middleman/vendor/hooks-0.2.0/Gemfile b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Gemfile
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/Gemfile
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Gemfile
diff --git a/lib/middleman/vendor/hooks-0.2.0/README.rdoc b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/README.rdoc
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/README.rdoc
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/README.rdoc
diff --git a/lib/middleman/vendor/hooks-0.2.0/Rakefile b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Rakefile
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/Rakefile
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Rakefile
diff --git a/lib/middleman/vendor/hooks-0.2.0/hooks.gemspec b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/hooks.gemspec
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/hooks.gemspec
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/hooks.gemspec
diff --git a/lib/middleman/vendor/hooks-0.2.0/lib/hooks.rb b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/lib/hooks.rb
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb
diff --git a/lib/middleman/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
diff --git a/lib/middleman/vendor/hooks-0.2.0/test/hooks_test.rb b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/test/hooks_test.rb
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb
diff --git a/lib/middleman/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb
diff --git a/lib/middleman/vendor/hooks-0.2.0/test/test_helper.rb b/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb
similarity index 100%
rename from lib/middleman/vendor/hooks-0.2.0/test/test_helper.rb
rename to middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/.document b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.document
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/.document
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.document
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/.gitignore b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.gitignore
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/.gitignore
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.gitignore
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/.yardopts b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.yardopts
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/.yardopts
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/.yardopts
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/LICENSE.txt b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/LICENSE.txt
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/LICENSE.txt
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/LICENSE.txt
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/README.rdoc b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/README.rdoc
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/README.rdoc
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/README.rdoc
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/Rakefile b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/Rakefile
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/Rakefile
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/Rakefile
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/bin/padrino b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/bin/padrino
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/bin/padrino
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/bin/padrino
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/rendering.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/rendering.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/rendering.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/rendering.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/routing.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/routing.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/routing.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/routing.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/showexceptions.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/showexceptions.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/application/showexceptions.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/application/showexceptions.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/caller.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/caller.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/caller.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/caller.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/adapter.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/adapter.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/adapter.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/adapter.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/base.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/base.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/base.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/base.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/console.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/console.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/console.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/console.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake_tasks.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake_tasks.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake_tasks.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/cli/rake_tasks.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/command.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/command.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/command.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/command.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/404.png b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/images/404.png
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/404.png
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/images/404.png
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/500.png b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/images/500.png
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/images/500.png
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/images/500.png
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/loader.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/loader.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/loader.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/loader.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/cs.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/cs.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/cs.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/cs.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/da.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/da.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/da.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/da.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/de.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/de.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/de.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/de.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/en.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/en.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/en.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/en.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/es.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/es.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/es.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/es.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/fr.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/fr.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/fr.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/fr.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/hu.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/hu.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/hu.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/hu.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/it.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/it.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/it.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/it.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ja.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ja.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ja.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ja.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/lv.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/lv.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/lv.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/lv.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/nl.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/nl.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/nl.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/nl.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/no.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/no.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/no.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/no.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pl.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pl.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pl.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pl.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pt_br.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pt_br.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pt_br.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/pt_br.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ru.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ru.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ru.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/ru.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/tr.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/tr.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/tr.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/tr.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/uk.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/uk.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/uk.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/uk.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_cn.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_cn.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_cn.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_cn.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_tw.yml b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_tw.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_tw.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/locale/zh_tw.yml
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/logger.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/logger.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/logger.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/logger.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/mounter.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/mounter.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/mounter.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/mounter.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/reloader.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/reloader.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/reloader.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/reloader.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/router.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/router.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/router.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/router.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/server.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/server.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/server.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/server.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
similarity index 98%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
index d5c64260..cf99a16d 100644
--- a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
+++ b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite.rb
@@ -191,7 +191,8 @@ end
 ##
 # Loads our locale configuration files
 #
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
+
+# I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
 
 ##
 # Used to determine if this file has already been required
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/tasks.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/tasks.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/tasks.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/tasks.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/version.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/version.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/lib/padrino-core/version.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/version.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/padrino-core.gemspec b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/padrino-core.gemspec
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/padrino-core.gemspec
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/padrino-core.gemspec
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.components b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/.components
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.components
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/.components
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.gitignore b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/.gitignore
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/.gitignore
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/.gitignore
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/complex.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/complex.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/complex.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/complex.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/simple.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/simple.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/apps/simple.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/apps/simple.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/a.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/a.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/a.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/a.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/b.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/b.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/b.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/b.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/c.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/c.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/c.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/c.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/e.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/e.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/e.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/e.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/f.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/f.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/f.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/f.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/g.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/g.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/g.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/circular/g.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/d.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/d.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/fixtures/dependencies/d.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/fixtures/dependencies/d.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/helper.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/helper.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/helper.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/helper.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/mini_shoulda.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/mini_shoulda.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/mini_shoulda.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/mini_shoulda.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_application.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_application.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_application.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_application.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_core.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_core.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_core.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_core.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_dependencies.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_dependencies.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_dependencies.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_dependencies.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_filters.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_filters.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_filters.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_filters.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_locale.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_locale.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_locale.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_locale.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_logger.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_logger.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_logger.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_logger.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_mounter.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_mounter.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_mounter.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_mounter.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_complex.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_reloader_complex.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_complex.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_reloader_complex.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_simple.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_reloader_simple.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_reloader_simple.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_reloader_simple.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_rendering.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_rendering.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_rendering.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_rendering.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_restful_routing.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_restful_routing.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_restful_routing.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_restful_routing.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_router.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_router.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_router.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_router.rb
diff --git a/lib/middleman/vendor/padrino-core-0.10.5/test/test_routing.rb b/middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_routing.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-core-0.10.5/test/test_routing.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-core-0.10.5/test/test_routing.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/.document b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.document
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/.document
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.document
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/.gitignore b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.gitignore
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/.gitignore
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.gitignore
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/.yardopts b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.yardopts
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/.yardopts
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/.yardopts
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/LICENSE.txt b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/LICENSE.txt
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/LICENSE.txt
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/LICENSE.txt
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/README.rdoc b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/README.rdoc
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/README.rdoc
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/README.rdoc
diff --git a/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/Rakefile b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/Rakefile
new file mode 100644
index 00000000..f33347d2
--- /dev/null
+++ b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/Rakefile
@@ -0,0 +1,5 @@
+# coding:utf-8
+RAKE_ROOT = __FILE__
+
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
similarity index 95%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
index 20ef3c89..751230ef 100644
--- a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
+++ b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb
@@ -1,6 +1,6 @@
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'cgi'
-require 'i18n'
+# require 'i18n'
 require 'enumerator'
 require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/core_ext/float/rounding'      # round
@@ -11,7 +11,7 @@ require 'active_support/inflector'                    # humanize
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
 
 # Load our locales
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
+# I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
 
 module Padrino
   ##
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/asset_tag_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/asset_tag_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/asset_tag_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/asset_tag_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/abstract_form_builder.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/abstract_form_builder.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/abstract_form_builder.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/abstract_form_builder.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/standard_form_builder.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/standard_form_builder.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/standard_form_builder.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_builder/standard_form_builder.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/form_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/format_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/format_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/format_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/format_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/cs.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/cs.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/cs.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/cs.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/da.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/da.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/da.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/da.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/de.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/de.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/de.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/de.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/en.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/en.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/en.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/en.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/es.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/es.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/es.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/es.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/fr.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/fr.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/fr.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/fr.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/hu.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/hu.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/hu.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/hu.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/it.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/it.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/it.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/it.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ja.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ja.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ja.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ja.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/lv.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/lv.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/lv.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/lv.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/nl.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/nl.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/nl.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/nl.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/no.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/no.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/no.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/no.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pl.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pl.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pl.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pl.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pt_br.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pt_br.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pt_br.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/pt_br.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ru.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ru.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ru.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/ru.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/tr.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/tr.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/tr.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/tr.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/uk.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/uk.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/uk.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/uk.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_cn.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_cn.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_cn.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_cn.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_tw.yml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_tw.yml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_tw.yml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/zh_tw.yml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/number_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/number_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/number_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/number_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/abstract_handler.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/abstract_handler.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/abstract_handler.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/abstract_handler.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/erb_handler.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/erb_handler.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/erb_handler.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/erb_handler.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/haml_handler.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/haml_handler.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/haml_handler.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/haml_handler.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/slim_handler.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/slim_handler.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/slim_handler.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/output_helpers/slim_handler.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/render_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/render_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/render_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/render_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/tag_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/tag_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/tag_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/tag_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/translation_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/translation_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/translation_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers/translation_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/padrino-helpers.gemspec b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/padrino-helpers.gemspec
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/padrino-helpers.gemspec
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/padrino-helpers.gemspec
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/app.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/app.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/app.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/app.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/capture_concat.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_for.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/content_tag.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/current_engine.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/fields_for.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_for.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/form_tag.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/link_to.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/mail_to.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/meta_tag.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_erb.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_erb.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_erb.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_erb.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_haml.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_haml.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_haml.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_haml.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_slim.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_slim.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_slim.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/partials/_slim.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/markup_app/views/simple_partial.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/app.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/app.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/app.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/app.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engine.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engine.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engine.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engine.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_erb.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_erb.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_erb.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_erb.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_haml.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_haml.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_haml.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_haml.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_slim.slim b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_slim.slim
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_slim.slim
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/current_engines/_slim.slim
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/erb/test.erb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/erb/test.erb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/erb/test.erb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/erb/test.erb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/explicit_engine.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/explicit_engine.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/explicit_engine.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/explicit_engine.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/haml/test.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/haml/test.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/haml/test.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/haml/test.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/_user.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/_user.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/_user.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/_user.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/haml_template.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/haml_template.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/haml_template.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/haml_template.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/some_template.haml b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/some_template.haml
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/some_template.haml
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/fixtures/render_app/views/template/some_template.haml
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/helper.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/helper.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/helper.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/helper.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_asset_tag_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_asset_tag_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_asset_tag_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_asset_tag_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_builder.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_form_builder.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_builder.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_form_builder.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_form_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_form_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_form_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_format_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_format_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_format_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_format_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_locale.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_locale.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_locale.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_locale.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_number_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_number_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_number_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_number_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_output_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_render_helpers.rb
diff --git a/lib/middleman/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb b/middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb
similarity index 100%
rename from lib/middleman/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb
rename to middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/test/test_tag_helpers.rb
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
new file mode 100644
index 00000000..a50227b5
--- /dev/null
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -0,0 +1,7 @@
+module Middleman
+  module Core
+    # Current Version
+    # @return [String]
+    VERSION = "3.0.0.alpha.6"
+  end
+end
\ No newline at end of file
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
new file mode 100644
index 00000000..e376685a
--- /dev/null
+++ b/middleman-core/middleman-core.gemspec
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "middleman-core/version"
+
+Gem::Specification.new do |s|
+  s.name        = "middleman-core"
+  s.version     = Middleman::Core::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.license     = "MIT"
+  s.authors     = ["Thomas Reynolds"]
+  s.email       = ["me@tdreyno.com"]
+  s.homepage    = "http://middlemanapp.com"
+  s.summary     = "Hand-crafted frontend development"
+  s.description = "A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # Core
+  s.add_dependency("rack", ["~> 1.3.5"])
+  s.add_dependency("rack-test", ["~> 0.6.1"])
+  s.add_dependency("tilt", ["~> 1.3.1"])
+  
+  # CLI
+  s.add_dependency("thor", ["~> 0.14.0"])
+  
+  # Helpers
+  # s.add_dependency("i18n", ["~> 0.6.0"])
+  s.add_dependency("activesupport", ["~> 3.1.0"])
+  
+  # Watcher
+  s.add_dependency("guard", ["~> 0.9.4"])
+end
+
diff --git a/middleman-more/Gemfile b/middleman-more/Gemfile
new file mode 100644
index 00000000..a2c18724
--- /dev/null
+++ b/middleman-more/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+ 
+gemspec :name => "middleman-more"
\ No newline at end of file
diff --git a/middleman-more/Rakefile b/middleman-more/Rakefile
new file mode 100644
index 00000000..0be3d96c
--- /dev/null
+++ b/middleman-more/Rakefile
@@ -0,0 +1,17 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks :name => ENV["NAME"] || "middleman"
+
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
+  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+end
+
+require 'rake/clean'
+
+task :test => ["cucumber"]
+
+desc "Build HTML documentation"
+task :doc do
+  sh 'bundle exec yard'
+end
diff --git a/features/asset_host.feature b/middleman-more/features/asset_host.feature
similarity index 100%
rename from features/asset_host.feature
rename to middleman-more/features/asset_host.feature
diff --git a/features/automatic_image_sizes.feature b/middleman-more/features/automatic_image_sizes.feature
similarity index 100%
rename from features/automatic_image_sizes.feature
rename to middleman-more/features/automatic_image_sizes.feature
diff --git a/features/cache_buster.feature b/middleman-more/features/cache_buster.feature
similarity index 100%
rename from features/cache_buster.feature
rename to middleman-more/features/cache_buster.feature
diff --git a/features/coffee-script.feature b/middleman-more/features/coffee-script.feature
similarity index 100%
rename from features/coffee-script.feature
rename to middleman-more/features/coffee-script.feature
diff --git a/features/content_for.feature b/middleman-more/features/content_for.feature
similarity index 77%
rename from features/content_for.feature
rename to middleman-more/features/content_for.feature
index 10113526..4dc806c9 100644
--- a/features/content_for.feature
+++ b/middleman-more/features/content_for.feature
@@ -1,16 +1,16 @@
 Feature: Support content_for and yield_content helpers
 
   Scenario: content_for works as expected in erb
-    Given the Server is running at "test-app"
+    Given the Server is running at "content-for-app"
     When I go to "/content_for_erb.html"
     Then I should see "In Layout: I am the yielded content erb"
     
   Scenario: content_for works as expected in haml
-    Given the Server is running at "test-app"
+    Given the Server is running at "content-for-app"
     When I go to "/content_for_haml.html"
     Then I should see "In Layout: I am the yielded content haml"
     
   Scenario: content_for works as expected in slim
-    Given the Server is running at "test-app"
+    Given the Server is running at "content-for-app"
     When I go to "/content_for_slim.html"
     Then I should see "In Layout: I am the yielded content slim"
\ No newline at end of file
diff --git a/features/fonts.feature b/middleman-more/features/fonts.feature
similarity index 100%
rename from features/fonts.feature
rename to middleman-more/features/fonts.feature
diff --git a/features/ignore_already_minified.features b/middleman-more/features/ignore_already_minified.features
similarity index 100%
rename from features/ignore_already_minified.features
rename to middleman-more/features/ignore_already_minified.features
diff --git a/features/liquid.feature b/middleman-more/features/liquid.feature
similarity index 100%
rename from features/liquid.feature
rename to middleman-more/features/liquid.feature
diff --git a/features/markdown.feature b/middleman-more/features/markdown.feature
similarity index 100%
rename from features/markdown.feature
rename to middleman-more/features/markdown.feature
diff --git a/features/minify_css.feature b/middleman-more/features/minify_css.feature
similarity index 100%
rename from features/minify_css.feature
rename to middleman-more/features/minify_css.feature
diff --git a/features/minify_javascript.feature b/middleman-more/features/minify_javascript.feature
similarity index 100%
rename from features/minify_javascript.feature
rename to middleman-more/features/minify_javascript.feature
diff --git a/features/relative_assets.feature b/middleman-more/features/relative_assets.feature
similarity index 100%
rename from features/relative_assets.feature
rename to middleman-more/features/relative_assets.feature
diff --git a/features/sass_partials.feature b/middleman-more/features/sass_partials.feature
similarity index 100%
rename from features/sass_partials.feature
rename to middleman-more/features/sass_partials.feature
diff --git a/features/scss-support.feature b/middleman-more/features/scss-support.feature
similarity index 100%
rename from features/scss-support.feature
rename to middleman-more/features/scss-support.feature
diff --git a/features/slim.feature b/middleman-more/features/slim.feature
similarity index 100%
rename from features/slim.feature
rename to middleman-more/features/slim.feature
diff --git a/features/sprockets.feature b/middleman-more/features/sprockets.feature
similarity index 100%
rename from features/sprockets.feature
rename to middleman-more/features/sprockets.feature
diff --git a/features/sprockets_gems.feature b/middleman-more/features/sprockets_gems.feature
similarity index 100%
rename from features/sprockets_gems.feature
rename to middleman-more/features/sprockets_gems.feature
diff --git a/fixtures/already-minified-app/config.rb b/middleman-more/fixtures-old/already-minified-app/config.rb
similarity index 100%
rename from fixtures/already-minified-app/config.rb
rename to middleman-more/fixtures-old/already-minified-app/config.rb
diff --git a/fixtures/already-minified-app/source/javascripts/test.min.js b/middleman-more/fixtures-old/already-minified-app/source/javascripts/test.min.js
similarity index 100%
rename from fixtures/already-minified-app/source/javascripts/test.min.js
rename to middleman-more/fixtures-old/already-minified-app/source/javascripts/test.min.js
diff --git a/fixtures/already-minified-app/source/stylesheets/test.min.css b/middleman-more/fixtures-old/already-minified-app/source/stylesheets/test.min.css
similarity index 100%
rename from fixtures/already-minified-app/source/stylesheets/test.min.css
rename to middleman-more/fixtures-old/already-minified-app/source/stylesheets/test.min.css
diff --git a/fixtures/asset-host-app/config.rb b/middleman-more/fixtures-old/asset-host-app/config.rb
similarity index 100%
rename from fixtures/asset-host-app/config.rb
rename to middleman-more/fixtures-old/asset-host-app/config.rb
diff --git a/fixtures/test-app/source/.htaccess b/middleman-more/fixtures-old/asset-host-app/source/.htaccess
similarity index 100%
rename from fixtures/test-app/source/.htaccess
rename to middleman-more/fixtures-old/asset-host-app/source/.htaccess
diff --git a/fixtures/asset-host-app/source/asset_host.html.haml b/middleman-more/fixtures-old/asset-host-app/source/asset_host.html.haml
similarity index 100%
rename from fixtures/asset-host-app/source/asset_host.html.haml
rename to middleman-more/fixtures-old/asset-host-app/source/asset_host.html.haml
diff --git a/fixtures/relative-app/source/images/blank.gif b/middleman-more/fixtures-old/asset-host-app/source/images/blank.gif
similarity index 100%
rename from fixtures/relative-app/source/images/blank.gif
rename to middleman-more/fixtures-old/asset-host-app/source/images/blank.gif
diff --git a/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass b/middleman-more/fixtures-old/asset-host-app/source/stylesheets/asset_host.css.sass
similarity index 100%
rename from fixtures/asset-host-app/source/stylesheets/asset_host.css.sass
rename to middleman-more/fixtures-old/asset-host-app/source/stylesheets/asset_host.css.sass
diff --git a/middleman-more/fixtures-old/fonts-app/config.rb b/middleman-more/fixtures-old/fonts-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/fixtures/fonts-app/source/fonts/StMarie-Thin.otf b/middleman-more/fixtures-old/fonts-app/source/fonts/StMarie-Thin.otf
similarity index 100%
rename from fixtures/fonts-app/source/fonts/StMarie-Thin.otf
rename to middleman-more/fixtures-old/fonts-app/source/fonts/StMarie-Thin.otf
diff --git a/fixtures/fonts-app/source/stylesheets/fonts.css.sass b/middleman-more/fixtures-old/fonts-app/source/stylesheets/fonts.css.sass
similarity index 100%
rename from fixtures/fonts-app/source/stylesheets/fonts.css.sass
rename to middleman-more/fixtures-old/fonts-app/source/stylesheets/fonts.css.sass
diff --git a/fixtures/markdown-app/config.rb b/middleman-more/fixtures-old/markdown-app/config.rb
similarity index 100%
rename from fixtures/markdown-app/config.rb
rename to middleman-more/fixtures-old/markdown-app/config.rb
diff --git a/fixtures/markdown-app/source/autolink.html.markdown b/middleman-more/fixtures-old/markdown-app/source/autolink.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/autolink.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/autolink.html.markdown
diff --git a/fixtures/markdown-app/source/fenced_code_blocks.html.markdown b/middleman-more/fixtures-old/markdown-app/source/fenced_code_blocks.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/fenced_code_blocks.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/fenced_code_blocks.html.markdown
diff --git a/fixtures/markdown-app/source/index.html.markdown b/middleman-more/fixtures-old/markdown-app/source/index.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/index.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/index.html.markdown
diff --git a/fixtures/markdown-app/source/no_intra_emphasis.html.markdown b/middleman-more/fixtures-old/markdown-app/source/no_intra_emphasis.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/no_intra_emphasis.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/no_intra_emphasis.html.markdown
diff --git a/fixtures/markdown-app/source/smarty_pants.html.markdown b/middleman-more/fixtures-old/markdown-app/source/smarty_pants.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/smarty_pants.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/smarty_pants.html.markdown
diff --git a/fixtures/markdown-app/source/space_after_headers.html.markdown b/middleman-more/fixtures-old/markdown-app/source/space_after_headers.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/space_after_headers.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/space_after_headers.html.markdown
diff --git a/fixtures/markdown-app/source/strikethrough.html.markdown b/middleman-more/fixtures-old/markdown-app/source/strikethrough.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/strikethrough.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/strikethrough.html.markdown
diff --git a/fixtures/markdown-app/source/superscript.html.markdown b/middleman-more/fixtures-old/markdown-app/source/superscript.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/superscript.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/superscript.html.markdown
diff --git a/fixtures/markdown-app/source/tables.html.markdown b/middleman-more/fixtures-old/markdown-app/source/tables.html.markdown
similarity index 100%
rename from fixtures/markdown-app/source/tables.html.markdown
rename to middleman-more/fixtures-old/markdown-app/source/tables.html.markdown
diff --git a/middleman-more/fixtures-old/relative-app/config.rb b/middleman-more/fixtures-old/relative-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/fixtures/test-app/source/images/blank.gif b/middleman-more/fixtures-old/relative-app/source/images/blank.gif
similarity index 100%
rename from fixtures/test-app/source/images/blank.gif
rename to middleman-more/fixtures-old/relative-app/source/images/blank.gif
diff --git a/fixtures/relative-app/source/stylesheets/relative_assets.css.sass b/middleman-more/fixtures-old/relative-app/source/stylesheets/relative_assets.css.sass
similarity index 100%
rename from fixtures/relative-app/source/stylesheets/relative_assets.css.sass
rename to middleman-more/fixtures-old/relative-app/source/stylesheets/relative_assets.css.sass
diff --git a/fixtures/sprockets-app/config.rb b/middleman-more/fixtures-old/sprockets-app/config.rb
similarity index 100%
rename from fixtures/sprockets-app/config.rb
rename to middleman-more/fixtures-old/sprockets-app/config.rb
diff --git a/fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss b/middleman-more/fixtures-old/sprockets-app/source/library/css/bootstrap_include.css.scss
similarity index 100%
rename from fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
rename to middleman-more/fixtures-old/sprockets-app/source/library/css/bootstrap_include.css.scss
diff --git a/fixtures/sprockets-app/source/library/css/plain.css b/middleman-more/fixtures-old/sprockets-app/source/library/css/plain.css
similarity index 100%
rename from fixtures/sprockets-app/source/library/css/plain.css
rename to middleman-more/fixtures-old/sprockets-app/source/library/css/plain.css
diff --git a/fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss b/middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_base1.css.scss
similarity index 100%
rename from fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
rename to middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_base1.css.scss
diff --git a/fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss b/middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_base2.css.scss
similarity index 100%
rename from fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
rename to middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_base2.css.scss
diff --git a/fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss b/middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_sub.css.scss
similarity index 100%
rename from fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
rename to middleman-more/fixtures-old/sprockets-app/source/library/css/sprockets_sub.css.scss
diff --git a/fixtures/sprockets-app/source/library/js/jquery_include.js b/middleman-more/fixtures-old/sprockets-app/source/library/js/jquery_include.js
similarity index 100%
rename from fixtures/sprockets-app/source/library/js/jquery_include.js
rename to middleman-more/fixtures-old/sprockets-app/source/library/js/jquery_include.js
diff --git a/fixtures/sprockets-app/source/library/js/plain.js b/middleman-more/fixtures-old/sprockets-app/source/library/js/plain.js
similarity index 100%
rename from fixtures/sprockets-app/source/library/js/plain.js
rename to middleman-more/fixtures-old/sprockets-app/source/library/js/plain.js
diff --git a/fixtures/sprockets-app/source/library/js/sprockets_base.js b/middleman-more/fixtures-old/sprockets-app/source/library/js/sprockets_base.js
similarity index 100%
rename from fixtures/sprockets-app/source/library/js/sprockets_base.js
rename to middleman-more/fixtures-old/sprockets-app/source/library/js/sprockets_base.js
diff --git a/fixtures/sprockets-app/source/library/js/sprockets_sub.js b/middleman-more/fixtures-old/sprockets-app/source/library/js/sprockets_sub.js
similarity index 100%
rename from fixtures/sprockets-app/source/library/js/sprockets_sub.js
rename to middleman-more/fixtures-old/sprockets-app/source/library/js/sprockets_sub.js
diff --git a/fixtures/test-app/config.rb b/middleman-more/fixtures-old/test-app/config.rb
similarity index 100%
rename from fixtures/test-app/config.rb
rename to middleman-more/fixtures-old/test-app/config.rb
diff --git a/middleman-more/fixtures-old/test-app/data/test.yml b/middleman-more/fixtures-old/test-app/data/test.yml
new file mode 100644
index 00000000..26cf591e
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/data/test.yml
@@ -0,0 +1,4 @@
+-
+  title: "One"
+-
+  title: "Two"
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/data/test2.json b/middleman-more/fixtures-old/test-app/data/test2.json
new file mode 100644
index 00000000..9f8b79c6
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/data/test2.json
@@ -0,0 +1,4 @@
+[
+  { "title": "One" },
+  { "title": "Two" }
+]
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/.htaccess b/middleman-more/fixtures-old/test-app/source/.htaccess
new file mode 100644
index 00000000..875bc5c4
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/.htaccess
@@ -0,0 +1 @@
+# I'm an htaccess file!
\ No newline at end of file
diff --git a/fixtures/test-app/source/_liquid_partial.liquid b/middleman-more/fixtures-old/test-app/source/_liquid_partial.liquid
similarity index 100%
rename from fixtures/test-app/source/_liquid_partial.liquid
rename to middleman-more/fixtures-old/test-app/source/_liquid_partial.liquid
diff --git a/fixtures/test-app/source/_partial.haml b/middleman-more/fixtures-old/test-app/source/_partial.haml
similarity index 100%
rename from fixtures/test-app/source/_partial.haml
rename to middleman-more/fixtures-old/test-app/source/_partial.haml
diff --git a/fixtures/test-app/source/a_folder/needs_index.html b/middleman-more/fixtures-old/test-app/source/a_folder/needs_index.html
similarity index 100%
rename from fixtures/test-app/source/a_folder/needs_index.html
rename to middleman-more/fixtures-old/test-app/source/a_folder/needs_index.html
diff --git a/fixtures/test-app/source/asset_host.html.haml b/middleman-more/fixtures-old/test-app/source/asset_host.html.haml
similarity index 100%
rename from fixtures/test-app/source/asset_host.html.haml
rename to middleman-more/fixtures-old/test-app/source/asset_host.html.haml
diff --git a/fixtures/test-app/source/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-css.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-css.html.haml
diff --git a/fixtures/test-app/source/auto-css/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/auto-css.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-css/auto-css.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-css/auto-css.html.haml
diff --git a/fixtures/test-app/source/auto-css/index.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/index.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-css/index.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-css/index.html.haml
diff --git a/fixtures/test-app/source/auto-css/sub/auto-css.html.haml b/middleman-more/fixtures-old/test-app/source/auto-css/sub/auto-css.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-css/sub/auto-css.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-css/sub/auto-css.html.haml
diff --git a/fixtures/test-app/source/auto-image-sizes.html.haml b/middleman-more/fixtures-old/test-app/source/auto-image-sizes.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-image-sizes.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-image-sizes.html.haml
diff --git a/fixtures/test-app/source/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-js.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-js.html.haml
diff --git a/fixtures/test-app/source/auto-js/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/auto-js.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-js/auto-js.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-js/auto-js.html.haml
diff --git a/fixtures/test-app/source/auto-js/index.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/index.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-js/index.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-js/index.html.haml
diff --git a/fixtures/test-app/source/auto-js/sub/auto-js.html.haml b/middleman-more/fixtures-old/test-app/source/auto-js/sub/auto-js.html.haml
similarity index 100%
rename from fixtures/test-app/source/auto-js/sub/auto-js.html.haml
rename to middleman-more/fixtures-old/test-app/source/auto-js/sub/auto-js.html.haml
diff --git a/fixtures/test-app/source/cache-buster.html.haml b/middleman-more/fixtures-old/test-app/source/cache-buster.html.haml
similarity index 100%
rename from fixtures/test-app/source/cache-buster.html.haml
rename to middleman-more/fixtures-old/test-app/source/cache-buster.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb b/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb
new file mode 100644
index 00000000..0af8266a
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/content_for_erb.html.erb
@@ -0,0 +1,5 @@
+<% content_for :from_template do %>
+  I am the yielded content erb
+<% end %>
+
+I am in the template
\ No newline at end of file
diff --git a/fixtures/test-app/source/content_for_haml.html.haml b/middleman-more/fixtures-old/test-app/source/content_for_haml.html.haml
similarity index 100%
rename from fixtures/test-app/source/content_for_haml.html.haml
rename to middleman-more/fixtures-old/test-app/source/content_for_haml.html.haml
diff --git a/fixtures/test-app/source/content_for_slim.html.slim b/middleman-more/fixtures-old/test-app/source/content_for_slim.html.slim
similarity index 100%
rename from fixtures/test-app/source/content_for_slim.html.slim
rename to middleman-more/fixtures-old/test-app/source/content_for_slim.html.slim
diff --git a/fixtures/data-app/source/index.html.haml b/middleman-more/fixtures-old/test-app/source/custom-layout-dir/index.html.haml
similarity index 100%
rename from fixtures/data-app/source/index.html.haml
rename to middleman-more/fixtures-old/test-app/source/custom-layout-dir/index.html.haml
diff --git a/fixtures/test-app/source/custom-layout.html.haml b/middleman-more/fixtures-old/test-app/source/custom-layout.html.haml
similarity index 100%
rename from fixtures/test-app/source/custom-layout.html.haml
rename to middleman-more/fixtures-old/test-app/source/custom-layout.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/data.html.erb b/middleman-more/fixtures-old/test-app/source/data.html.erb
new file mode 100644
index 00000000..a18f3afc
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/data.html.erb
@@ -0,0 +1 @@
+<%= data.test.map { |r| r.title }.join(":") %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/data2.html.liquid b/middleman-more/fixtures-old/test-app/source/data2.html.liquid
similarity index 100%
rename from fixtures/test-app/source/data2.html.liquid
rename to middleman-more/fixtures-old/test-app/source/data2.html.liquid
diff --git a/middleman-more/fixtures-old/test-app/source/data3.html.erb b/middleman-more/fixtures-old/test-app/source/data3.html.erb
new file mode 100644
index 00000000..d2ac7634
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/data3.html.erb
@@ -0,0 +1 @@
+<%= data.test2.map { |r| r.title }.join(":") %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/former_padrino_test.html.haml b/middleman-more/fixtures-old/test-app/source/former_padrino_test.html.haml
similarity index 100%
rename from fixtures/test-app/source/former_padrino_test.html.haml
rename to middleman-more/fixtures-old/test-app/source/former_padrino_test.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb b/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb
new file mode 100644
index 00000000..205a442f
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/front-matter-2.php.erb
@@ -0,0 +1,7 @@
+---
+layout: false
+title: This is the title
+---
+
+<h1><%= data.page.title %></h1>
+<?php echo "sup"; ?>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb b/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb
new file mode 100644
index 00000000..044e469d
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/front-matter-change.html.erb
@@ -0,0 +1,5 @@
+---
+title: Hola Mundo
+layout: false
+---
+<%= data.page.title %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/front-matter.html.erb b/middleman-more/fixtures-old/test-app/source/front-matter.html.erb
new file mode 100644
index 00000000..73d30e72
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/front-matter.html.erb
@@ -0,0 +1,6 @@
+---
+layout: false
+title: This is the title
+---
+
+<h1><%= data.page.title %></h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt b/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt
new file mode 100644
index 00000000..ea9503c0
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/images/Child folder/regular_file(example).txt	
@@ -0,0 +1 @@
+Regular
\ No newline at end of file
diff --git a/fixtures/test-app/source/images/Chrome_Logo.svg b/middleman-more/fixtures-old/test-app/source/images/Chrome_Logo.svg
similarity index 100%
rename from fixtures/test-app/source/images/Chrome_Logo.svg
rename to middleman-more/fixtures-old/test-app/source/images/Chrome_Logo.svg
diff --git a/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt b/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt
new file mode 100644
index 00000000..100b9382
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/images/Read me (example).txt	
@@ -0,0 +1 @@
+README
\ No newline at end of file
diff --git a/fixtures/test-app/source/img/blank.gif b/middleman-more/fixtures-old/test-app/source/images/blank.gif
similarity index 100%
rename from fixtures/test-app/source/img/blank.gif
rename to middleman-more/fixtures-old/test-app/source/images/blank.gif
diff --git a/fixtures/test-app/source/images/cfb_tomb-perennial-energy.svgz b/middleman-more/fixtures-old/test-app/source/images/cfb_tomb-perennial-energy.svgz
similarity index 100%
rename from fixtures/test-app/source/images/cfb_tomb-perennial-energy.svgz
rename to middleman-more/fixtures-old/test-app/source/images/cfb_tomb-perennial-energy.svgz
diff --git a/middleman-more/fixtures-old/test-app/source/img/blank.gif b/middleman-more/fixtures-old/test-app/source/img/blank.gif
new file mode 100755
index 00000000..2498f1aa
Binary files /dev/null and b/middleman-more/fixtures-old/test-app/source/img/blank.gif differ
diff --git a/fixtures/test-app/source/index.html.slim b/middleman-more/fixtures-old/test-app/source/index.html.slim
similarity index 100%
rename from fixtures/test-app/source/index.html.slim
rename to middleman-more/fixtures-old/test-app/source/index.html.slim
diff --git a/fixtures/test-app/source/inline-coffeescript.html.haml b/middleman-more/fixtures-old/test-app/source/inline-coffeescript.html.haml
similarity index 100%
rename from fixtures/test-app/source/inline-coffeescript.html.haml
rename to middleman-more/fixtures-old/test-app/source/inline-coffeescript.html.haml
diff --git a/fixtures/test-app/source/inline-css.html.haml b/middleman-more/fixtures-old/test-app/source/inline-css.html.haml
similarity index 100%
rename from fixtures/test-app/source/inline-css.html.haml
rename to middleman-more/fixtures-old/test-app/source/inline-css.html.haml
diff --git a/fixtures/test-app/source/inline-js.html.haml b/middleman-more/fixtures-old/test-app/source/inline-js.html.haml
similarity index 100%
rename from fixtures/test-app/source/inline-js.html.haml
rename to middleman-more/fixtures-old/test-app/source/inline-js.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js.js
@@ -0,0 +1 @@
+
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/auto-js.js
@@ -0,0 +1 @@
+
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/index.js
@@ -0,0 +1 @@
+
diff --git a/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/javascripts/auto-js/sub/auto-js.js
@@ -0,0 +1 @@
+
diff --git a/fixtures/test-app/source/javascripts/broken-coffee.js.coffee b/middleman-more/fixtures-old/test-app/source/javascripts/broken-coffee.js.coffee
similarity index 100%
rename from fixtures/test-app/source/javascripts/broken-coffee.js.coffee
rename to middleman-more/fixtures-old/test-app/source/javascripts/broken-coffee.js.coffee
diff --git a/fixtures/test-app/source/javascripts/coffee_test.js.coffee b/middleman-more/fixtures-old/test-app/source/javascripts/coffee_test.js.coffee
similarity index 100%
rename from fixtures/test-app/source/javascripts/coffee_test.js.coffee
rename to middleman-more/fixtures-old/test-app/source/javascripts/coffee_test.js.coffee
diff --git a/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js b/middleman-more/fixtures-old/test-app/source/javascripts/jquery.plugin.with.dots.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
rename to middleman-more/fixtures-old/test-app/source/javascripts/jquery.plugin.with.dots.js
diff --git a/fixtures/test-app/source/javascripts/jquery_base.js b/middleman-more/fixtures-old/test-app/source/javascripts/jquery_base.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/jquery_base.js
rename to middleman-more/fixtures-old/test-app/source/javascripts/jquery_base.js
diff --git a/fixtures/test-app/source/javascripts/js_test.js b/middleman-more/fixtures-old/test-app/source/javascripts/js_test.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/js_test.js
rename to middleman-more/fixtures-old/test-app/source/javascripts/js_test.js
diff --git a/fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb b/middleman-more/fixtures-old/test-app/source/javascripts/multiple_engines.js.coffee.erb
similarity index 100%
rename from fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb
rename to middleman-more/fixtures-old/test-app/source/javascripts/multiple_engines.js.coffee.erb
diff --git a/fixtures/test-app/source/javascripts/sprockets_base.js b/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_base.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/sprockets_base.js
rename to middleman-more/fixtures-old/test-app/source/javascripts/sprockets_base.js
diff --git a/fixtures/test-app/source/javascripts/sprockets_sub.js b/middleman-more/fixtures-old/test-app/source/javascripts/sprockets_sub.js
similarity index 100%
rename from fixtures/test-app/source/javascripts/sprockets_sub.js
rename to middleman-more/fixtures-old/test-app/source/javascripts/sprockets_sub.js
diff --git a/fixtures/clean-app/source/layout.haml b/middleman-more/fixtures-old/test-app/source/layout.haml
similarity index 100%
rename from fixtures/clean-app/source/layout.haml
rename to middleman-more/fixtures-old/test-app/source/layout.haml
diff --git a/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb b/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb
new file mode 100644
index 00000000..30a09340
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/layouts/content_for.erb
@@ -0,0 +1,4 @@
+In Layout: <%= yield_content(:from_template).chomp.strip %>
+
+In Template:
+<%= yield %>
\ No newline at end of file
diff --git a/fixtures/clean-app/source/layouts/custom.haml b/middleman-more/fixtures-old/test-app/source/layouts/custom.haml
similarity index 100%
rename from fixtures/clean-app/source/layouts/custom.haml
rename to middleman-more/fixtures-old/test-app/source/layouts/custom.haml
diff --git a/fixtures/test-app/source/liquid_master.html.liquid b/middleman-more/fixtures-old/test-app/source/liquid_master.html.liquid
similarity index 100%
rename from fixtures/test-app/source/liquid_master.html.liquid
rename to middleman-more/fixtures-old/test-app/source/liquid_master.html.liquid
diff --git a/middleman-more/fixtures-old/test-app/source/lorem.html.erb b/middleman-more/fixtures-old/test-app/source/lorem.html.erb
new file mode 100644
index 00000000..924dab7d
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/lorem.html.erb
@@ -0,0 +1,13 @@
+<%= lorem.word %>
+<%= lorem.words(5) %>
+<%= lorem.sentence %>
+<%= lorem.sentences(2) %>
+<%= lorem.paragraph %>
+<%= lorem.paragraphs(2) %>
+<%= lorem.date %>
+<%= lorem.name %>
+<%= lorem.first_name %>
+<%= lorem.last_name %>
+<%= lorem.email %>
+<%= image_tag lorem.image(100) %>
+<%= image_tag placekitten(100) %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/needs_index.html b/middleman-more/fixtures-old/test-app/source/needs_index.html
similarity index 100%
rename from fixtures/test-app/source/needs_index.html
rename to middleman-more/fixtures-old/test-app/source/needs_index.html
diff --git a/middleman-more/fixtures-old/test-app/source/other_layout.erb b/middleman-more/fixtures-old/test-app/source/other_layout.erb
new file mode 100644
index 00000000..e4d2addd
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/other_layout.erb
@@ -0,0 +1 @@
+This is another layout!
\ No newline at end of file
diff --git a/fixtures/test-app/source/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/page-classes.html.haml
similarity index 100%
rename from fixtures/test-app/source/page-classes.html.haml
rename to middleman-more/fixtures-old/test-app/source/page-classes.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/real.html b/middleman-more/fixtures-old/test-app/source/real.html
new file mode 100644
index 00000000..cb312952
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/real.html
@@ -0,0 +1 @@
+I am real
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/real/index.html.erb b/middleman-more/fixtures-old/test-app/source/real/index.html.erb
new file mode 100644
index 00000000..190d84ec
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/real/index.html.erb
@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+I am real: <%= @num %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/relative_image.html.erb b/middleman-more/fixtures-old/test-app/source/relative_image.html.erb
similarity index 100%
rename from fixtures/test-app/source/relative_image.html.erb
rename to middleman-more/fixtures-old/test-app/source/relative_image.html.erb
diff --git a/middleman-more/fixtures-old/test-app/source/request-path.html.erb b/middleman-more/fixtures-old/test-app/source/request-path.html.erb
new file mode 100644
index 00000000..cb134235
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/request-path.html.erb
@@ -0,0 +1 @@
+<%= current_path == request.path %>
\ No newline at end of file
diff --git a/fixtures/test-app/source/services/index.html.haml b/middleman-more/fixtures-old/test-app/source/services/index.html.haml
similarity index 100%
rename from fixtures/test-app/source/services/index.html.haml
rename to middleman-more/fixtures-old/test-app/source/services/index.html.haml
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored.html
new file mode 100644
index 00000000..fb81d5c0
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored.html
@@ -0,0 +1 @@
+<h1>Ignore me!</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html
new file mode 100644
index 00000000..0940fd7c
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored2.html
@@ -0,0 +1 @@
+<h1>Ignore me! 2</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html
new file mode 100644
index 00000000..98007c81
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored3.html
@@ -0,0 +1 @@
+<h1>Ignore me! 3</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html
new file mode 100644
index 00000000..b11a0596
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored4.html
@@ -0,0 +1 @@
+<h1>Ignore me! 4</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html
new file mode 100644
index 00000000..f348b0ad
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored5.html
@@ -0,0 +1 @@
+<h1>Ignore me! 5</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html
new file mode 100644
index 00000000..234e60b7
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored6.html
@@ -0,0 +1 @@
+<h1>Ignore me! 6</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html
new file mode 100644
index 00000000..4179fb19
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored7.html
@@ -0,0 +1 @@
+<h1>Ignore me! 7</h1>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html b/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html
new file mode 100644
index 00000000..2c2c24ab
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/should_be_ignored8.html
@@ -0,0 +1 @@
+<h1>Ignore me! 8</h1>
\ No newline at end of file
diff --git a/fixtures/test-app/source/slim.html.slim b/middleman-more/fixtures-old/test-app/source/slim.html.slim
similarity index 100%
rename from fixtures/test-app/source/slim.html.slim
rename to middleman-more/fixtures-old/test-app/source/slim.html.slim
diff --git a/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb b/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb
new file mode 100644
index 00000000..c67dbe85
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/spaces in file.html.erb	
@@ -0,0 +1 @@
+<%= "spaces" %>
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/static.html b/middleman-more/fixtures-old/test-app/source/static.html
new file mode 100755
index 00000000..7e50df4e
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/static.html
@@ -0,0 +1 @@
+Static, no code!
\ No newline at end of file
diff --git a/fixtures/test-app/source/stylesheets/asset_host.css.sass b/middleman-more/fixtures-old/test-app/source/stylesheets/asset_host.css.sass
similarity index 100%
rename from fixtures/test-app/source/stylesheets/asset_host.css.sass
rename to middleman-more/fixtures-old/test-app/source/stylesheets/asset_host.css.sass
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css
new file mode 100755
index 00000000..8a4ef0de
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css.css
@@ -0,0 +1,3 @@
+auto {
+  css: 1;
+}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css
new file mode 100755
index 00000000..76ded88e
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/auto-css.css
@@ -0,0 +1,3 @@
+auto {
+  css: 2;
+}
\ No newline at end of file
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/index.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css
new file mode 100755
index 00000000..f68dee75
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/stylesheets/auto-css/sub/auto-css.css
@@ -0,0 +1,3 @@
+auto {
+  css: 3;
+}
\ No newline at end of file
diff --git a/fixtures/test-app/source/stylesheets/layout.css.sass b/middleman-more/fixtures-old/test-app/source/stylesheets/layout.css.sass
similarity index 100%
rename from fixtures/test-app/source/stylesheets/layout.css.sass
rename to middleman-more/fixtures-old/test-app/source/stylesheets/layout.css.sass
diff --git a/fixtures/test-app/source/stylesheets/relative_assets.css.sass b/middleman-more/fixtures-old/test-app/source/stylesheets/relative_assets.css.sass
similarity index 100%
rename from fixtures/test-app/source/stylesheets/relative_assets.css.sass
rename to middleman-more/fixtures-old/test-app/source/stylesheets/relative_assets.css.sass
diff --git a/fixtures/passthrough-app/source/stylesheets/site.css.sass b/middleman-more/fixtures-old/test-app/source/stylesheets/site.css.sass
similarity index 100%
rename from fixtures/passthrough-app/source/stylesheets/site.css.sass
rename to middleman-more/fixtures-old/test-app/source/stylesheets/site.css.sass
diff --git a/fixtures/test-app/source/stylesheets/site_scss.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/site_scss.css.scss
similarity index 100%
rename from fixtures/test-app/source/stylesheets/site_scss.css.scss
rename to middleman-more/fixtures-old/test-app/source/stylesheets/site_scss.css.scss
diff --git a/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base1.css.scss
similarity index 100%
rename from fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
rename to middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base1.css.scss
diff --git a/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base2.css.scss
similarity index 100%
rename from fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
rename to middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_base2.css.scss
diff --git a/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss b/middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_sub.css.scss
similarity index 100%
rename from fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
rename to middleman-more/fixtures-old/test-app/source/stylesheets/sprockets_sub.css.scss
diff --git a/middleman-more/fixtures-old/test-app/source/stylesheets/static.css b/middleman-more/fixtures-old/test-app/source/stylesheets/static.css
new file mode 100755
index 00000000..536410d1
--- /dev/null
+++ b/middleman-more/fixtures-old/test-app/source/stylesheets/static.css
@@ -0,0 +1,2 @@
+body {
+  font-size: 12px; }
\ No newline at end of file
diff --git a/fixtures/test-app/source/sub1/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/sub1/page-classes.html.haml
similarity index 100%
rename from fixtures/test-app/source/sub1/page-classes.html.haml
rename to middleman-more/fixtures-old/test-app/source/sub1/page-classes.html.haml
diff --git a/fixtures/test-app/source/sub1/sub2/page-classes.html.haml b/middleman-more/fixtures-old/test-app/source/sub1/sub2/page-classes.html.haml
similarity index 100%
rename from fixtures/test-app/source/sub1/sub2/page-classes.html.haml
rename to middleman-more/fixtures-old/test-app/source/sub1/sub2/page-classes.html.haml
diff --git a/fixtures/test-app/source/tiny_src.html.haml b/middleman-more/fixtures-old/test-app/source/tiny_src.html.haml
similarity index 100%
rename from fixtures/test-app/source/tiny_src.html.haml
rename to middleman-more/fixtures-old/test-app/source/tiny_src.html.haml
diff --git a/middleman-more/fixtures/content-for-app/config.rb b/middleman-more/fixtures/content-for-app/config.rb
new file mode 100644
index 00000000..83259448
--- /dev/null
+++ b/middleman-more/fixtures/content-for-app/config.rb
@@ -0,0 +1,5 @@
+with_layout :content_for do
+  page "/content_for_erb.html"
+  # page "/content_for_haml.html"
+  # page "/content_for_slim.html"
+end
\ No newline at end of file
diff --git a/middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb b/middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb
new file mode 100644
index 00000000..0af8266a
--- /dev/null
+++ b/middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb
@@ -0,0 +1,5 @@
+<% content_for :from_template do %>
+  I am the yielded content erb
+<% end %>
+
+I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures/content-for-app/source/content_for_haml.html.haml b/middleman-more/fixtures/content-for-app/source/content_for_haml.html.haml
new file mode 100644
index 00000000..e4a7522a
--- /dev/null
+++ b/middleman-more/fixtures/content-for-app/source/content_for_haml.html.haml
@@ -0,0 +1,4 @@
+- content_for :from_template do
+  = "I am the yielded content haml"
+
+%p I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures/content-for-app/source/content_for_slim.html.slim b/middleman-more/fixtures/content-for-app/source/content_for_slim.html.slim
new file mode 100644
index 00000000..89267513
--- /dev/null
+++ b/middleman-more/fixtures/content-for-app/source/content_for_slim.html.slim
@@ -0,0 +1,4 @@
+- content_for :from_template do
+  | I am the yielded content slim
+
+| I am in the template
\ No newline at end of file
diff --git a/middleman-more/fixtures/content-for-app/source/layouts/content_for.erb b/middleman-more/fixtures/content-for-app/source/layouts/content_for.erb
new file mode 100644
index 00000000..30a09340
--- /dev/null
+++ b/middleman-more/fixtures/content-for-app/source/layouts/content_for.erb
@@ -0,0 +1,4 @@
+In Layout: <%= yield_content(:from_template).chomp.strip %>
+
+In Template:
+<%= yield %>
\ No newline at end of file
diff --git a/middleman-more/fixtures/preview-app/config.rb b/middleman-more/fixtures/preview-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/fixtures/preview-app/source/content.html.erb b/middleman-more/fixtures/preview-app/source/content.html.erb
new file mode 100644
index 00000000..ade1f58b
--- /dev/null
+++ b/middleman-more/fixtures/preview-app/source/content.html.erb
@@ -0,0 +1 @@
+Hola Mundo
\ No newline at end of file
diff --git a/middleman-more/fixtures/preview-app/source/layout.erb b/middleman-more/fixtures/preview-app/source/layout.erb
new file mode 100644
index 00000000..cd9bb66d
--- /dev/null
+++ b/middleman-more/fixtures/preview-app/source/layout.erb
@@ -0,0 +1 @@
+<%= yield %>
\ No newline at end of file
diff --git a/fixtures/preview-app/source/stylesheets/_partial.sass b/middleman-more/fixtures/preview-app/source/stylesheets/_partial.sass
similarity index 100%
rename from fixtures/preview-app/source/stylesheets/_partial.sass
rename to middleman-more/fixtures/preview-app/source/stylesheets/_partial.sass
diff --git a/fixtures/preview-app/source/stylesheets/_partial2.css.sass b/middleman-more/fixtures/preview-app/source/stylesheets/_partial2.css.sass
similarity index 100%
rename from fixtures/preview-app/source/stylesheets/_partial2.css.sass
rename to middleman-more/fixtures/preview-app/source/stylesheets/_partial2.css.sass
diff --git a/fixtures/preview-app/source/stylesheets/main.css.sass b/middleman-more/fixtures/preview-app/source/stylesheets/main.css.sass
similarity index 100%
rename from fixtures/preview-app/source/stylesheets/main.css.sass
rename to middleman-more/fixtures/preview-app/source/stylesheets/main.css.sass
diff --git a/fixtures/preview-app/source/stylesheets/main2.css.sass b/middleman-more/fixtures/preview-app/source/stylesheets/main2.css.sass
similarity index 100%
rename from fixtures/preview-app/source/stylesheets/main2.css.sass
rename to middleman-more/fixtures/preview-app/source/stylesheets/main2.css.sass
diff --git a/fixtures/preview-app/source/stylesheets/plain.css.sass b/middleman-more/fixtures/preview-app/source/stylesheets/plain.css.sass
similarity index 100%
rename from fixtures/preview-app/source/stylesheets/plain.css.sass
rename to middleman-more/fixtures/preview-app/source/stylesheets/plain.css.sass
diff --git a/middleman-more/lib/middleman-more.rb b/middleman-more/lib/middleman-more.rb
new file mode 100644
index 00000000..ac00fc43
--- /dev/null
+++ b/middleman-more/lib/middleman-more.rb
@@ -0,0 +1,47 @@
+# Setup our load paths
+libdir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+# Top-level Middleman object
+module Middleman
+  
+  # Custom Renderers
+  module Renderers
+    autoload :Haml,         "middleman-more/renderers/haml"
+    autoload :Sass,         "middleman-more/renderers/sass"
+    autoload :Markdown,     "middleman-more/renderers/markdown"
+    autoload :Liquid,       "middleman-more/renderers/liquid"
+  end
+  
+  module Extensions
+    # Compass framework for Sass
+    autoload :Compass,             "middleman-more/core_extensions/compass"
+    
+    # Sprockets 2
+    autoload :Sprockets,           "middleman-more/core_extensions/sprockets"
+    
+    # RelativeAssets allow any asset path in dynamic templates to be either
+    # relative to the root of the project or use an absolute URL.
+    autoload :RelativeAssets,      "middleman-more/extensions/relative_assets"
+
+    # AssetHost allows you to setup multiple domains to host your static
+    # assets. Calls to asset paths in dynamic templates will then rotate
+    # through each of the asset servers to better spread the load.
+    autoload :AssetHost,           "middleman-more/extensions/asset_host"
+
+    # CacheBuster adds a query string to assets in dynamic templates to avoid
+    # browser caches failing to update to your new content.
+    autoload :CacheBuster,         "middleman-more/extensions/cache_buster"
+
+    # AutomaticImageSizes inspects the images used in your dynamic templates
+    # and automatically adds width and height attributes to their HTML
+    # elements.
+    autoload :AutomaticImageSizes, "middleman-more/extensions/automatic_image_sizes"
+
+    # MinifyCss uses the YUI compressor to shrink CSS files
+    autoload :MinifyCss,           "middleman-more/extensions/minify_css"
+
+    # MinifyJavascript uses the YUI compressor to shrink JS files
+    autoload :MinifyJavascript,    "middleman-more/extensions/minify_javascript"
+  end
+end
\ No newline at end of file
diff --git a/lib/middleman/extensions/asset_host.rb b/middleman-more/lib/middleman-more/extensions/asset_host.rb
similarity index 100%
rename from lib/middleman/extensions/asset_host.rb
rename to middleman-more/lib/middleman-more/extensions/asset_host.rb
diff --git a/lib/middleman/extensions/automatic_image_sizes.rb b/middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb
similarity index 93%
rename from lib/middleman/extensions/automatic_image_sizes.rb
rename to middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb
index 45003c01..afb22561 100755
--- a/lib/middleman/extensions/automatic_image_sizes.rb
+++ b/middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb
@@ -2,7 +2,7 @@ module Middleman::Extensions
   module AutomaticImageSizes
     class << self
       def registered(app)
-        require "middleman/extensions/automatic_image_sizes/fastimage"
+        require "middleman-core/extensions/automatic_image_sizes/fastimage"
 
         app.send :include, InstanceMethods
       end
diff --git a/lib/middleman/extensions/automatic_image_sizes/fastimage.rb b/middleman-more/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb
similarity index 100%
rename from lib/middleman/extensions/automatic_image_sizes/fastimage.rb
rename to middleman-more/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb
diff --git a/lib/middleman/extensions/cache_buster.rb b/middleman-more/lib/middleman-more/extensions/cache_buster.rb
similarity index 100%
rename from lib/middleman/extensions/cache_buster.rb
rename to middleman-more/lib/middleman-more/extensions/cache_buster.rb
diff --git a/lib/middleman/core_extensions/compass.rb b/middleman-more/lib/middleman-more/extensions/compass.rb
similarity index 100%
rename from lib/middleman/core_extensions/compass.rb
rename to middleman-more/lib/middleman-more/extensions/compass.rb
diff --git a/lib/middleman/extensions/minify_css.rb b/middleman-more/lib/middleman-more/extensions/minify_css.rb
similarity index 82%
rename from lib/middleman/extensions/minify_css.rb
rename to middleman-more/lib/middleman-more/extensions/minify_css.rb
index 7b1fe4c9..ae6d3973 100644
--- a/lib/middleman/extensions/minify_css.rb
+++ b/middleman-more/lib/middleman-more/extensions/minify_css.rb
@@ -4,7 +4,7 @@ module Middleman::Extensions
       def registered(app)
         app.after_configuration do
           if !css_compressor
-            require "middleman/extensions/minify_css/cssmin"
+            require "middleman-core/extensions/minify_css/cssmin"
             set :css_compressor, ::CSSMin
           end
         end
diff --git a/lib/middleman/extensions/minify_css/cssmin.rb b/middleman-more/lib/middleman-more/extensions/minify_css/cssmin.rb
similarity index 100%
rename from lib/middleman/extensions/minify_css/cssmin.rb
rename to middleman-more/lib/middleman-more/extensions/minify_css/cssmin.rb
diff --git a/lib/middleman/extensions/minify_javascript.rb b/middleman-more/lib/middleman-more/extensions/minify_javascript.rb
similarity index 100%
rename from lib/middleman/extensions/minify_javascript.rb
rename to middleman-more/lib/middleman-more/extensions/minify_javascript.rb
diff --git a/lib/middleman/extensions/relative_assets.rb b/middleman-more/lib/middleman-more/extensions/relative_assets.rb
similarity index 100%
rename from lib/middleman/extensions/relative_assets.rb
rename to middleman-more/lib/middleman-more/extensions/relative_assets.rb
diff --git a/lib/middleman/core_extensions/sprockets.rb b/middleman-more/lib/middleman-more/extensions/sprockets.rb
similarity index 100%
rename from lib/middleman/core_extensions/sprockets.rb
rename to middleman-more/lib/middleman-more/extensions/sprockets.rb
diff --git a/lib/middleman/renderers/haml.rb b/middleman-more/lib/middleman-more/renderers/haml.rb
similarity index 100%
rename from lib/middleman/renderers/haml.rb
rename to middleman-more/lib/middleman-more/renderers/haml.rb
diff --git a/lib/middleman/renderers/liquid.rb b/middleman-more/lib/middleman-more/renderers/liquid.rb
similarity index 100%
rename from lib/middleman/renderers/liquid.rb
rename to middleman-more/lib/middleman-more/renderers/liquid.rb
diff --git a/lib/middleman/renderers/markdown.rb b/middleman-more/lib/middleman-more/renderers/markdown.rb
similarity index 100%
rename from lib/middleman/renderers/markdown.rb
rename to middleman-more/lib/middleman-more/renderers/markdown.rb
diff --git a/lib/middleman/renderers/sass.rb b/middleman-more/lib/middleman-more/renderers/sass.rb
similarity index 100%
rename from lib/middleman/renderers/sass.rb
rename to middleman-more/lib/middleman-more/renderers/sass.rb
diff --git a/middleman-more/lib/middleman-more/setup.rb b/middleman-more/lib/middleman-more/setup.rb
new file mode 100644
index 00000000..c7c11464
--- /dev/null
+++ b/middleman-more/lib/middleman-more/setup.rb
@@ -0,0 +1,39 @@
+
+
+require "coffee_script"
+app.register Middleman::Renderers::Haml
+app.register Middleman::Renderers::Sass
+app.register Middleman::Renderers::Markdown
+app.register Middleman::Renderers::Liquid
+
+
+set :default_extensions, [
+  :lorem
+]
+
+
+
+# Compass framework
+register Middleman::CoreExtensions::Compass
+
+# Sprockets asset handling
+register Middleman::CoreExtensions::Sprockets
+
+# Activate built-in helpers
+register Middleman::CoreExtensions::DefaultHelpers
+
+
+    Middleman::Extensions.register(:asset_host) { 
+      Middleman::Extensions::AssetHost }
+    Middleman::Extensions.register(:automatic_image_sizes) {
+      Middleman::Extensions::AutomaticImageSizes }
+    Middleman::Extensions.register(:cache_buster) { 
+      Middleman::Extensions::CacheBuster }
+    Middleman::Extensions.register(:lorem) { 
+      Middleman::Extensions::Lorem }
+    Middleman::Extensions.register(:minify_css) { 
+      Middleman::Extensions::MinifyCss }
+    Middleman::Extensions.register(:minify_javascript) {
+      Middleman::Extensions::MinifyJavascript }
+    Middleman::Extensions.register(:relative_assets) {
+      Middleman::Extensions::RelativeAssets }
\ No newline at end of file
diff --git a/middleman-more/lib/middleman-more/version.rb b/middleman-more/lib/middleman-more/version.rb
new file mode 100644
index 00000000..a71306a2
--- /dev/null
+++ b/middleman-more/lib/middleman-more/version.rb
@@ -0,0 +1,7 @@
+module Middleman
+  module More
+    # Current Version
+    # @return [String]
+    VERSION = "3.0.0.alpha.6"
+  end
+end
\ No newline at end of file
diff --git a/middleman.gemspec b/middleman-more/middleman-more.gemspec
similarity index 82%
rename from middleman.gemspec
rename to middleman-more/middleman-more.gemspec
index cf682692..c1ad39d1 100644
--- a/middleman.gemspec
+++ b/middleman-more/middleman-more.gemspec
@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "middleman/version"
+require "middleman-more/version"
 
 Gem::Specification.new do |s|
-  s.name        = "middleman"
-  s.version     = Middleman::VERSION
+  s.name        = "middleman-more"
+  s.version     = Middleman::More::VERSION
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
   s.authors     = ["Thomas Reynolds"]
@@ -18,22 +18,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rack", ["~> 1.3.5"])
+  s.add_dependency("middleman-core")
   s.add_dependency("thin", ["~> 1.3.1"])
-  s.add_dependency("thor", ["~> 0.14.0"])
-  s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("i18n", ["~> 0.6.0"])
-  s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.2.0"])
   s.add_dependency("haml", ["~> 3.1.0"])
   s.add_dependency("sass", ["~> 3.1.7"])
-  s.add_dependency("activesupport", ["~> 3.1.0"])
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
-  s.add_dependency("sprockets", ["~> 2.1"])
   s.add_dependency("sprockets-sass", ["~> 0.6.0"])
-  s.add_dependency("guard", ["~> 0.9.4"])
   s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   # Development and test
diff --git a/middleman-x86-mingw32.gemspec b/middleman-x86-mingw32.gemspec
index 27d43bd0..113cfc61 100644
--- a/middleman-x86-mingw32.gemspec
+++ b/middleman-x86-mingw32.gemspec
@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "middleman/version"
+require "middleman-core/version"
 
 Gem::Specification.new do |s|
   s.name        = "middleman"
-  s.version     = Middleman::VERSION
+  s.version     = Middleman::Core::VERSION
   s.platform    = "x86-mingw32"
   s.license     = "MIT"
   s.authors     = ["Thomas Reynolds"]
diff --git a/middleman/lib/middleman.rb b/middleman/lib/middleman.rb
new file mode 100644
index 00000000..0116732c
--- /dev/null
+++ b/middleman/lib/middleman.rb
@@ -0,0 +1,8 @@
+require "middleman-core"
+require "middleman-more"
+
+# Make the VERSION string available
+require "middleman-core/version"
+
+# Automatically discover extensions in RubyGems
+Middleman.load_extensions_in_path
\ No newline at end of file