diff --git a/.gitmodules b/.gitmodules
index 4f5e8fa4..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "middleman-core/lib/middleman-more/templates/smacss"]
-	path = middleman-core/lib/middleman-more/templates/smacss
-	url = git@github.com:nsteiner/middleman-smacss.git
diff --git a/.yardopts b/.yardopts
index 40867ad0..980f0e4c 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1,10 +1,10 @@
 middleman-*/lib/**/*.rb
 --exclude middleman-core/lib/vendored-middleman-deps/
 --exclude middleman-core/lib/middleman-core/step_definitions
---exclude middleman-core/lib/middleman-core/templates/default/
---exclude middleman-core/lib/middleman-core/templates/html5/
---exclude middleman-core/lib/middleman-core/templates/mobile/
---exclude middleman-core/lib/middleman-core/templates/shared/
---exclude middleman-core/lib/middleman-core/templates/extension/
+--exclude middleman-cli/lib/middleman-cli/templates/default/
+--exclude middleman-cli/lib/middleman-cli/templates/html5/
+--exclude middleman-cli/lib/middleman-cli/templates/mobile/
+--exclude middleman-cli/lib/middleman-cli/templates/shared/
+--exclude middleman-cli/lib/middleman-cli/templates/extension/
 --no-private
 --hide-void-return
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index fec45479..a5046c8b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,5 +38,6 @@ gem 'rubocop', :require => false
 
 # Middleman itself
 gem 'middleman-core', :path => 'middleman-core'
+gem 'middleman-cli', :path => 'middleman-cli'
 gem 'middleman-sprockets', :github => 'middleman/middleman-sprockets', :require => false
 gem 'middleman', :path => 'middleman'
diff --git a/Rakefile b/Rakefile
index 642efee9..b8b528e4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,7 @@ require File.expand_path('../middleman-core/lib/middleman-core/version.rb', __FI
 ROOT = File.expand_path(File.dirname(__FILE__))
 GEM_NAME = 'middleman'
 
-middleman_gems = %w(middleman-core middleman)
+middleman_gems = %w(middleman-core middleman-cli middleman)
 GEM_PATHS = middleman_gems.freeze
 
 def sh_rake(command)
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/img/.gitignore b/middleman-cli/.gemtest
old mode 100755
new mode 100644
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/img/.gitignore
rename to middleman-cli/.gemtest
diff --git a/middleman-cli/.simplecov b/middleman-cli/.simplecov
new file mode 100644
index 00000000..1e7f68e2
--- /dev/null
+++ b/middleman-cli/.simplecov
@@ -0,0 +1,7 @@
+SimpleCov.start do
+  add_filter '/fixtures/'
+  add_filter '/features/'
+  add_filter '/spec/'
+  add_filter '/step_definitions/'
+  add_filter '/lib/vendored-middleman-deps/'
+end
\ No newline at end of file
diff --git a/middleman-cli/.yardopts b/middleman-cli/.yardopts
new file mode 100644
index 00000000..47ae041b
--- /dev/null
+++ b/middleman-cli/.yardopts
@@ -0,0 +1,8 @@
+lib/**/*.rb
+--exclude lib/middleman-cli/templates/default/
+--exclude lib/middleman-cli/templates/html5/
+--exclude lib/middleman-cli/templates/mobile/
+--exclude lib/middleman-cli/templates/shared/
+--exclude lib/middleman-cli/templates/extension/
+--no-private
+--hide-void-return
\ No newline at end of file
diff --git a/middleman-cli/Rakefile b/middleman-cli/Rakefile
new file mode 100644
index 00000000..f1f8c51e
--- /dev/null
+++ b/middleman-cli/Rakefile
@@ -0,0 +1,5 @@
+# coding:utf-8
+RAKE_ROOT = __FILE__
+
+GEM_NAME = 'middleman-cli'
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
diff --git a/middleman-core/bin/middleman b/middleman-cli/bin/middleman
similarity index 92%
rename from middleman-core/bin/middleman
rename to middleman-cli/bin/middleman
index d17dbd1b..924f905d 100755
--- a/middleman-core/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -9,7 +9,7 @@ Middleman::Profiling.start
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
-require "middleman-core/cli"
+require "middleman-cli"
 
 # Change directory to the root
 Dir.chdir(ENV["MM_ROOT"]) if ENV["MM_ROOT"]
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/script.js b/middleman-cli/features/.gitkeep
old mode 100755
new mode 100644
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/js/script.js
rename to middleman-cli/features/.gitkeep
diff --git a/middleman-cli/fixtures/.gitkeep b/middleman-cli/fixtures/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/cli.rb b/middleman-cli/lib/middleman-cli.rb
similarity index 88%
rename from middleman-core/lib/middleman-core/cli.rb
rename to middleman-cli/lib/middleman-cli.rb
index 7823de81..512ab3ce 100644
--- a/middleman-core/lib/middleman-core/cli.rb
+++ b/middleman-cli/lib/middleman-cli.rb
@@ -1,3 +1,7 @@
+# Setup our load paths
+libdir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
 # Require thor since that's what the who CLI is built around
 require 'thor'
 require 'thor/group'
@@ -82,9 +86,9 @@ module Middleman
 end
 
 # Include the core CLI items
-require 'middleman-core/cli/init'
-require 'middleman-core/cli/bundler'
-require 'middleman-core/cli/extension'
-require 'middleman-core/cli/server'
-require 'middleman-core/cli/build'
-require 'middleman-core/cli/console'
+require 'middleman-cli/init'
+require 'middleman-cli/bundler'
+require 'middleman-cli/extension'
+require 'middleman-cli/server'
+require 'middleman-cli/build'
+require 'middleman-cli/console'
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/cli/build.rb
rename to middleman-cli/lib/middleman-cli/build.rb
diff --git a/middleman-core/lib/middleman-core/cli/bundler.rb b/middleman-cli/lib/middleman-cli/bundler.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/cli/bundler.rb
rename to middleman-cli/lib/middleman-cli/bundler.rb
diff --git a/middleman-core/lib/middleman-core/cli/console.rb b/middleman-cli/lib/middleman-cli/console.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/cli/console.rb
rename to middleman-cli/lib/middleman-cli/console.rb
diff --git a/middleman-core/lib/middleman-core/cli/extension.rb b/middleman-cli/lib/middleman-cli/extension.rb
similarity index 52%
rename from middleman-core/lib/middleman-core/cli/extension.rb
rename to middleman-cli/lib/middleman-cli/extension.rb
index 1b077f50..71bfb38e 100644
--- a/middleman-core/lib/middleman-core/cli/extension.rb
+++ b/middleman-cli/lib/middleman-cli/extension.rb
@@ -15,21 +15,25 @@ module Middleman::Cli
     # Template files are relative to this file
     # @return [String]
     def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'templates', 'extension')
+      File.join(File.dirname(__FILE__), 'templates')
     end
 
     desc 'extension [options]', 'Create Middleman extension scaffold NAME'
+    method_option 'skip-git',
+      :type    => :boolean,
+      :default => false,
+      :desc    => 'Skip Git ignores and keeps'
 
     # The extension task
     # @param [String] name
     def extension
       generate_gitignore!
-      template 'Rakefile', File.join(name, 'Rakefile')
-      template 'gemspec', File.join(name, "#{name}.gemspec")
-      template 'Gemfile', File.join(name, 'Gemfile')
-      template 'lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb')
-      template 'lib/lib.rb', File.join(name, 'lib', "#{name}.rb")
-      template 'features/support/env.rb', File.join(name, 'features', 'support', 'env.rb')
+      template 'extension/Rakefile', File.join(name, 'Rakefile')
+      template 'extension/gemspec', File.join(name, "#{name}.gemspec")
+      template 'extension/Gemfile', File.join(name, 'Gemfile')
+      template 'extension/lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb')
+      template 'extension/lib/lib.rb', File.join(name, 'lib', "#{name}.rb")
+      template 'extension/features/support/env.rb', File.join(name, 'features', 'support', 'env.rb')
       empty_directory File.join(name, 'fixtures')
     end
 
@@ -40,8 +44,8 @@ module Middleman::Cli
       # Write a .gitignore file for project
       # @return [void]
       def generate_gitignore!
-        return unless options[:git]
-        copy_file 'gitignore', File.join(name, '.gitignore')
+        return if options[:'skip-git']
+        copy_file 'shared/gitignore', File.join(name, '.gitignore')
       end
     }
 
diff --git a/middleman-core/lib/middleman-core/cli/init.rb b/middleman-cli/lib/middleman-cli/init.rb
similarity index 98%
rename from middleman-core/lib/middleman-core/cli/init.rb
rename to middleman-cli/lib/middleman-cli/init.rb
index 6f61a080..2e588cc7 100644
--- a/middleman-core/lib/middleman-core/cli/init.rb
+++ b/middleman-cli/lib/middleman-cli/init.rb
@@ -1,4 +1,4 @@
-require 'middleman-core/templates'
+require 'middleman-cli/templates'
 
 # CLI Module
 module Middleman::Cli
diff --git a/middleman-core/lib/middleman-core/cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/cli/server.rb
rename to middleman-cli/lib/middleman-cli/server.rb
diff --git a/middleman-core/lib/middleman-core/templates.rb b/middleman-cli/lib/middleman-cli/templates.rb
similarity index 90%
rename from middleman-core/lib/middleman-core/templates.rb
rename to middleman-cli/lib/middleman-cli/templates.rb
index ba0e9d3e..c163a903 100644
--- a/middleman-core/lib/middleman-core/templates.rb
+++ b/middleman-cli/lib/middleman-cli/templates.rb
@@ -84,19 +84,16 @@ module Middleman::Templates
 end
 
 # Default template
-require 'middleman-core/templates/default'
+require 'middleman-cli/templates/default'
 
 # HTML5 template
-require 'middleman-core/templates/html5'
+require 'middleman-cli/templates/html5'
 
 # HTML5 Mobile template
-require 'middleman-core/templates/mobile'
-
-# SMACSS templates
-require 'middleman-more/templates/smacss'
+require 'middleman-cli/templates/mobile'
 
 # Local templates
-require 'middleman-core/templates/local'
+require 'middleman-cli/templates/local'
 
 # Barebones template
-require 'middleman-core/templates/empty'
+require 'middleman-cli/templates/empty'
diff --git a/middleman-core/lib/middleman-core/templates/default.rb b/middleman-cli/lib/middleman-cli/templates/default.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default.rb
rename to middleman-cli/lib/middleman-cli/templates/default.rb
diff --git a/middleman-core/lib/middleman-core/templates/default/source/images/background.png b/middleman-cli/lib/middleman-cli/templates/default/source/images/background.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/images/background.png
rename to middleman-cli/lib/middleman-cli/templates/default/source/images/background.png
diff --git a/middleman-core/lib/middleman-core/templates/default/source/images/middleman.png b/middleman-cli/lib/middleman-cli/templates/default/source/images/middleman.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/images/middleman.png
rename to middleman-cli/lib/middleman-cli/templates/default/source/images/middleman.png
diff --git a/middleman-core/lib/middleman-core/templates/default/source/index.html.erb b/middleman-cli/lib/middleman-cli/templates/default/source/index.html.erb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/index.html.erb
rename to middleman-cli/lib/middleman-cli/templates/default/source/index.html.erb
diff --git a/middleman-core/lib/middleman-core/templates/default/source/javascripts/all.js b/middleman-cli/lib/middleman-cli/templates/default/source/javascripts/all.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/javascripts/all.js
rename to middleman-cli/lib/middleman-cli/templates/default/source/javascripts/all.js
diff --git a/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb b/middleman-cli/lib/middleman-cli/templates/default/source/layouts/layout.erb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
rename to middleman-cli/lib/middleman-cli/templates/default/source/layouts/layout.erb
diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css b/middleman-cli/lib/middleman-cli/templates/default/source/stylesheets/all.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/stylesheets/all.css
rename to middleman-cli/lib/middleman-cli/templates/default/source/stylesheets/all.css
diff --git a/middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css b/middleman-cli/lib/middleman-cli/templates/default/source/stylesheets/normalize.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/default/source/stylesheets/normalize.css
rename to middleman-cli/lib/middleman-cli/templates/default/source/stylesheets/normalize.css
diff --git a/middleman-core/lib/middleman-core/templates/empty.rb b/middleman-cli/lib/middleman-cli/templates/empty.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/empty.rb
rename to middleman-cli/lib/middleman-cli/templates/empty.rb
diff --git a/middleman-core/lib/middleman-core/templates/empty/Gemfile.tt b/middleman-cli/lib/middleman-cli/templates/empty/Gemfile.tt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/empty/Gemfile.tt
rename to middleman-cli/lib/middleman-cli/templates/empty/Gemfile.tt
diff --git a/middleman-core/lib/middleman-core/templates/extension/Gemfile b/middleman-cli/lib/middleman-cli/templates/extension/Gemfile
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/Gemfile
rename to middleman-cli/lib/middleman-cli/templates/extension/Gemfile
diff --git a/middleman-core/lib/middleman-core/templates/extension/Rakefile b/middleman-cli/lib/middleman-cli/templates/extension/Rakefile
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/Rakefile
rename to middleman-cli/lib/middleman-cli/templates/extension/Rakefile
diff --git a/middleman-core/lib/middleman-core/templates/extension/features/support/env.rb b/middleman-cli/lib/middleman-cli/templates/extension/features/support/env.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/features/support/env.rb
rename to middleman-cli/lib/middleman-cli/templates/extension/features/support/env.rb
diff --git a/middleman-core/lib/middleman-core/templates/extension/gemspec b/middleman-cli/lib/middleman-cli/templates/extension/gemspec
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/gemspec
rename to middleman-cli/lib/middleman-cli/templates/extension/gemspec
diff --git a/middleman-core/lib/middleman-core/templates/extension/gitignore b/middleman-cli/lib/middleman-cli/templates/extension/gitignore
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/gitignore
rename to middleman-cli/lib/middleman-cli/templates/extension/gitignore
diff --git a/middleman-core/lib/middleman-core/templates/extension/lib/lib.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/lib/lib.rb
rename to middleman-cli/lib/middleman-cli/templates/extension/lib/lib.rb
diff --git a/middleman-core/lib/middleman-core/templates/extension/lib/middleman_extension.rb b/middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/extension/lib/middleman_extension.rb
rename to middleman-cli/lib/middleman-cli/templates/extension/lib/middleman_extension.rb
diff --git a/middleman-core/lib/middleman-core/templates/html5.rb b/middleman-cli/lib/middleman-cli/templates/html5.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5.rb
rename to middleman-cli/lib/middleman-cli/templates/html5.rb
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/.htaccess b/middleman-cli/lib/middleman-cli/templates/html5/source/.htaccess
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/.htaccess
rename to middleman-cli/lib/middleman-cli/templates/html5/source/.htaccess
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/404.html b/middleman-cli/lib/middleman-cli/templates/html5/source/404.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/404.html
rename to middleman-cli/lib/middleman-cli/templates/html5/source/404.html
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/LICENSE.md b/middleman-cli/lib/middleman-cli/templates/html5/source/LICENSE.md
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/LICENSE.md
rename to middleman-cli/lib/middleman-cli/templates/html5/source/LICENSE.md
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/README.md b/middleman-cli/lib/middleman-cli/templates/html5/source/README.md
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/README.md
rename to middleman-cli/lib/middleman-cli/templates/html5/source/README.md
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-114x114-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-114x114-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-114x114-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-144x144-precomposed.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-144x144-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-144x144-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-144x144-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-57x57-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-57x57-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-57x57-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-72x72-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-72x72-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-72x72-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon.png b/middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/apple-touch-icon.png
rename to middleman-cli/lib/middleman-cli/templates/html5/source/apple-touch-icon.png
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/crossdomain.xml b/middleman-cli/lib/middleman-cli/templates/html5/source/crossdomain.xml
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/crossdomain.xml
rename to middleman-cli/lib/middleman-cli/templates/html5/source/crossdomain.xml
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/css/main.css b/middleman-cli/lib/middleman-cli/templates/html5/source/css/main.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/css/main.css
rename to middleman-cli/lib/middleman-cli/templates/html5/source/css/main.css
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/css/normalize.css b/middleman-cli/lib/middleman-cli/templates/html5/source/css/normalize.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/css/normalize.css
rename to middleman-cli/lib/middleman-cli/templates/html5/source/css/normalize.css
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/favicon.ico b/middleman-cli/lib/middleman-cli/templates/html5/source/favicon.ico
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/favicon.ico
rename to middleman-cli/lib/middleman-cli/templates/html5/source/favicon.ico
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/humans.txt b/middleman-cli/lib/middleman-cli/templates/html5/source/humans.txt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/humans.txt
rename to middleman-cli/lib/middleman-cli/templates/html5/source/humans.txt
diff --git a/middleman-cli/lib/middleman-cli/templates/html5/source/img/.gitignore b/middleman-cli/lib/middleman-cli/templates/html5/source/img/.gitignore
new file mode 100755
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/index.html.erb b/middleman-cli/lib/middleman-cli/templates/html5/source/index.html.erb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/index.html.erb
rename to middleman-cli/lib/middleman-cli/templates/html5/source/index.html.erb
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/js/main.js b/middleman-cli/lib/middleman-cli/templates/html5/source/js/main.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/js/main.js
rename to middleman-cli/lib/middleman-cli/templates/html5/source/js/main.js
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/js/plugins.js b/middleman-cli/lib/middleman-cli/templates/html5/source/js/plugins.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/js/plugins.js
rename to middleman-cli/lib/middleman-cli/templates/html5/source/js/plugins.js
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/js/vendor/jquery-1.8.0.min.js b/middleman-cli/lib/middleman-cli/templates/html5/source/js/vendor/jquery-1.8.0.min.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/js/vendor/jquery-1.8.0.min.js
rename to middleman-cli/lib/middleman-cli/templates/html5/source/js/vendor/jquery-1.8.0.min.js
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/js/vendor/modernizr-2.6.1.min.js b/middleman-cli/lib/middleman-cli/templates/html5/source/js/vendor/modernizr-2.6.1.min.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/js/vendor/modernizr-2.6.1.min.js
rename to middleman-cli/lib/middleman-cli/templates/html5/source/js/vendor/modernizr-2.6.1.min.js
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb b/middleman-cli/lib/middleman-cli/templates/html5/source/layouts/layout.erb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb
rename to middleman-cli/lib/middleman-cli/templates/html5/source/layouts/layout.erb
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/robots.txt b/middleman-cli/lib/middleman-cli/templates/html5/source/robots.txt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/html5/source/robots.txt
rename to middleman-cli/lib/middleman-cli/templates/html5/source/robots.txt
diff --git a/middleman-core/lib/middleman-core/templates/local.rb b/middleman-cli/lib/middleman-cli/templates/local.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/local.rb
rename to middleman-cli/lib/middleman-cli/templates/local.rb
diff --git a/middleman-core/lib/middleman-core/templates/mobile.rb b/middleman-cli/lib/middleman-cli/templates/mobile.rb
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile.rb
rename to middleman-cli/lib/middleman-cli/templates/mobile.rb
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/404.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/404.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/404.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/404.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/README.markdown b/middleman-cli/lib/middleman-cli/templates/mobile/source/README.markdown
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/README.markdown
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/README.markdown
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/crossdomain.xml b/middleman-cli/lib/middleman-cli/templates/mobile/source/crossdomain.xml
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/crossdomain.xml
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/crossdomain.xml
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/css/style.css b/middleman-cli/lib/middleman-cli/templates/mobile/source/css/style.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/css/style.css
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/css/style.css
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/humans.txt b/middleman-cli/lib/middleman-cli/templates/mobile/source/humans.txt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/humans.txt
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/humans.txt
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/h/apple-touch-icon.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/h/apple-touch-icon.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/h/apple-touch-icon.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/h/splash.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/h/splash.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/h/splash.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/h/splash.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/apple-touch-icon-precomposed.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/apple-touch-icon.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/l/apple-touch-icon.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/apple-touch-icon.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/l/splash.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/splash.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/l/splash.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/l/splash.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/img/m/apple-touch-icon.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/img/m/apple-touch-icon.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/img/m/apple-touch-icon.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/index.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/index.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/index.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/index.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/js/libs/modernizr-custom.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/js/libs/modernizr-custom.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/js/libs/modernizr-custom.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/js/libs/respond.min.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/js/libs/respond.min.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/js/libs/respond.min.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/js/mylibs/helper.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/js/mylibs/helper.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/js/mylibs/helper.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/js/plugins.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/js/plugins.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/js/plugins.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/js/plugins.js
diff --git a/middleman-cli/lib/middleman-cli/templates/mobile/source/js/script.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/js/script.js
new file mode 100755
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/robots.txt b/middleman-cli/lib/middleman-cli/templates/mobile/source/robots.txt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/robots.txt
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/robots.txt
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/sitemap.xml b/middleman-cli/lib/middleman-cli/templates/mobile/source/sitemap.xml
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/sitemap.xml
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/sitemap.xml
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/test/index.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/test/index.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/test/index.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/test/index.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css b/middleman-cli/lib/middleman-cli/templates/mobile/source/test/qunit/qunit.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.css
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/test/qunit/qunit.css
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/test/qunit/qunit.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/test/qunit/qunit.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/test/qunit/qunit.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/test/tests.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/test/tests.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/test/tests.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/test/tests.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/README b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/README
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/README
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/README
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/databasefactory.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/databasefactory.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/databasefactory.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworker.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworker.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworker_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworker_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworker_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworkerstarter.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbworkerstarter.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbworkerstarter.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_gears.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_gears.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_html5.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_html5.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapperapi.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapperapi.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/dbwrapperapi_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_resultset.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_resultset.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_resultset_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_resultset_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_resultset_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_transaction.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_transaction.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_transaction_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gears_transaction_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gears_transaction_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gearsutils.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gearsutils.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gearsutils_test.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/gearsutils_test.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/gearsutils_test.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/global_functions.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/global_functions.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/global_functions.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/index.html
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/index.html
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/index.html
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/styles.css
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/styles.css
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/styles.css
diff --git a/middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js b/middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/template.js
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/mobile/source/tools/wspl/simplenotes/template.js
rename to middleman-cli/lib/middleman-cli/templates/mobile/source/tools/wspl/simplenotes/template.js
diff --git a/middleman-core/lib/middleman-core/templates/shared/Gemfile.tt b/middleman-cli/lib/middleman-cli/templates/shared/Gemfile.tt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/shared/Gemfile.tt
rename to middleman-cli/lib/middleman-cli/templates/shared/Gemfile.tt
diff --git a/middleman-core/lib/middleman-core/templates/shared/config.ru b/middleman-cli/lib/middleman-cli/templates/shared/config.ru
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/shared/config.ru
rename to middleman-cli/lib/middleman-cli/templates/shared/config.ru
diff --git a/middleman-core/lib/middleman-core/templates/shared/config.tt b/middleman-cli/lib/middleman-cli/templates/shared/config.tt
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/shared/config.tt
rename to middleman-cli/lib/middleman-cli/templates/shared/config.tt
diff --git a/middleman-core/lib/middleman-core/templates/shared/gitignore b/middleman-cli/lib/middleman-cli/templates/shared/gitignore
similarity index 100%
rename from middleman-core/lib/middleman-core/templates/shared/gitignore
rename to middleman-cli/lib/middleman-cli/templates/shared/gitignore
diff --git a/middleman-cli/middleman-cli.gemspec b/middleman-cli/middleman-cli.gemspec
new file mode 100644
index 00000000..5d9c1b90
--- /dev/null
+++ b/middleman-cli/middleman-cli.gemspec
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require File.expand_path("../../middleman-core/lib/middleman-core/version.rb", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "middleman-cli"
+  s.version     = Middleman::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.license     = "MIT"
+  s.authors     = ["Thomas Reynolds", "Ben Hollis"]
+  s.email       = ["me@tdreyno.com", "ben@benhollis.net"]
+  s.homepage    = "http://middlemanapp.com"
+  s.summary     = "Hand-crafted frontend development"
+  s.description = "A static site generator. Provides 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 -z`.split("\0")
+  s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.executable   = "middleman"
+  s.require_path = "lib"
+  s.required_ruby_version = '>= 1.9.3'
+
+  # CLI
+  s.add_dependency("thor", [">= 0.17.0", "< 2.0"])
+end
diff --git a/middleman-cli/spec/middleman/future_spec.rb b/middleman-cli/spec/middleman/future_spec.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-cli/spec/spec_helper.rb b/middleman-cli/spec/spec_helper.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/.yardopts b/middleman-core/.yardopts
index b6b437b9..29455a55 100644
--- a/middleman-core/.yardopts
+++ b/middleman-core/.yardopts
@@ -1,10 +1,5 @@
 lib/**/*.rb
 --exclude lib/vendored-middleman-deps/
 --exclude lib/middleman-core/step_definitions
---exclude lib/middleman-core/templates/default/
---exclude lib/middleman-core/templates/html5/
---exclude lib/middleman-core/templates/mobile/
---exclude lib/middleman-core/templates/shared/
---exclude lib/middleman-core/templates/extension/
 --no-private
 --hide-void-return
\ No newline at end of file
diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
index d967e204..155fad6a 100644
--- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
@@ -163,7 +163,7 @@ module Middleman::CoreExtensions
 
     # Get the frontmatter and plain content from a file
     # @param [String] path
-    # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
+    # @return [Array<Middleman::Util::HashWithIndifferentAccess, String>]
     def frontmatter_and_content(path)
       full_path = if Pathname(path).relative?
         File.join(app.source_dir, path)
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index 02892775..b4d919ca 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -46,10 +46,10 @@ module Middleman
       #
       # @private
       # @param [Hash] data Normal hash
-      # @return [Thor::CoreExt::HashWithIndifferentAccess]
+      # @return [Middleman::Util::HashWithIndifferentAccess]
       def recursively_enhance(data)
         if data.is_a? Hash
-          data = ::Thor::CoreExt::HashWithIndifferentAccess.new(data)
+          data = ::Middleman::Util::HashWithIndifferentAccess.new(data)
           data.each do |key, val|
             data[key] = recursively_enhance(val)
           end
@@ -217,7 +217,7 @@ module Middleman
         end
       end
 
-    private
+      private
 
       # Is mime type known to be non-binary?
       #
@@ -277,5 +277,81 @@ module Middleman
         end
       end
     end
+  
+    # A hash with indifferent access and magic predicates.
+    # Copied from Thor
+    #
+    #   hash = Middleman::Application.new 'foo' => 'bar', 'baz' => 'bee', 'force' => true
+    #
+    #   hash[:foo]  #=> 'bar'
+    #   hash['foo'] #=> 'bar'
+    #   hash.foo?   #=> true
+    #
+    class HashWithIndifferentAccess < ::Hash #:nodoc:
+
+      def initialize(hash={})
+        super()
+        hash.each do |key, value|
+          self[convert_key(key)] = value
+        end
+      end
+
+      def [](key)
+        super(convert_key(key))
+      end
+
+      def []=(key, value)
+        super(convert_key(key), value)
+      end
+
+      def delete(key)
+        super(convert_key(key))
+      end
+
+      def values_at(*indices)
+        indices.collect { |key| self[convert_key(key)] }
+      end
+
+      def merge(other)
+        dup.merge!(other)
+      end
+
+      def merge!(other)
+        other.each do |key, value|
+          self[convert_key(key)] = value
+        end
+        self
+      end
+
+      # Convert to a Hash with String keys.
+      def to_hash
+        Hash.new(default).merge!(self)
+      end
+
+      protected
+
+        def convert_key(key)
+          key.is_a?(Symbol) ? key.to_s : key
+        end
+
+        # Magic predicates. For instance:
+        #
+        #   options.force?                  # => !!options['force']
+        #   options.shebang                 # => "/usr/lib/local/ruby"
+        #   options.test_framework?(:rspec) # => options[:test_framework] == :rspec
+        #
+        def method_missing(method, *args, &block)
+          method = method.to_s
+          if method =~ /^(\w+)\?$/
+            if args.empty?
+              !!self[$1]
+            else
+              self[$1] == args.first
+            end
+          else
+            self[method]
+          end
+        end
+    end
   end
-end
\ No newline at end of file
+end
diff --git a/middleman-core/lib/middleman-more/templates/smacss.rb b/middleman-core/lib/middleman-more/templates/smacss.rb
deleted file mode 100644
index bfe5c914..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# SMACSS
-class Middleman::Templates::Smacss < Middleman::Templates::Base
-
-  class_option 'css_dir',
-    :default => 'stylesheets',
-    :desc    => 'The path to the css files'
-  class_option 'js_dir',
-    :default => 'javascripts',
-    :desc    => 'The path to the javascript files'
-  class_option 'images_dir',
-    :default => 'images',
-    :desc    => 'The path to the image files'
-
-  # Template files are relative to this file
-  # @return [String]
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
-  # Output the files
-  # @return [void]
-  def build_scaffold!
-    template 'shared/config.tt', File.join(location, 'config.rb')
-    directory 'smacss/source', File.join(location, 'source')
-    empty_directory File.join(location, 'source')
-  end
-end
-
-# Register the template
-Middleman::Templates.register(:smacss, Middleman::Templates::Smacss)
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/_footer.haml b/middleman-core/lib/middleman-more/templates/smacss/source/_footer.haml
deleted file mode 100644
index 59c013fd..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/_footer.haml
+++ /dev/null
@@ -1 +0,0 @@
-%footer &copy; 2013
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/index.html.haml b/middleman-core/lib/middleman-more/templates/smacss/source/index.html.haml
deleted file mode 100644
index 88a918cc..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Middleman
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/layouts/layout.haml b/middleman-core/lib/middleman-more/templates/smacss/source/layouts/layout.haml
deleted file mode 100644
index 7e54cc78..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/layouts/layout.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-!!! 5
-%html
-  %head
-    %title Middleman
-    %meta{:charset => "utf-8"}
-    %meta{:content => "Middleman", :name => "description"}
-    %meta{:content => "on", "http-equiv" => "cleartype"}
-    %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
-    %link{:href => "stylesheets/style.css", :rel => "stylesheet"}
-
-  %body
-    = yield
-    = render_partial 'footer'
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown
deleted file mode 100644
index 77d0402c..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown
+++ /dev/null
@@ -1,11 +0,0 @@
-# SMACSS
-
-### Base
-
-> A Base rule is applied to an element using an element selector, a descendent selector, or a child selector, along with any pseudo-classes. It doesn’t include any class or ID selectors. It is defining the default styling for how that element should look in all occurrences on the page.
-
-> - SMACSS, Jonathan Snook
-
-Place files here that impact top-level elements to apply global styles.
-
-This template includes [`normalize.css`](http://necolas.github.com/normalize.css/) to give consistent base styles for all browsers.
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss
deleted file mode 100644
index 10051c76..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss
+++ /dev/null
@@ -1 +0,0 @@
-// Placeholder
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss
deleted file mode 100644
index 57b5d267..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss
+++ /dev/null
@@ -1,375 +0,0 @@
-/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
-
-/* ==========================================================================
-   HTML5 display definitions
-   ========================================================================== */
-
-/*
- * Corrects `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/*
- * Corrects `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/*
- * Prevents modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/*
- * Addresses styling for `hidden` attribute not present in IE 8/9.
- */
-
-[hidden] {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/*
- * 1. Sets default font family to sans-serif.
- * 2. Prevents iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-
-html {
-    font-family: sans-serif; /* 1 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-    -ms-text-size-adjust: 100%; /* 2 */
-}
-
-/*
- * Removes default margin.
- */
-
-body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/*
- * Addresses `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/*
- * Improves readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/*
- * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
- * Safari 5, and Chrome.
- */
-
-h1 {
-    font-size: 2em;
-}
-
-/*
- * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
- */
-
-abbr[title] {
-    border-bottom: 1px dotted;
-}
-
-/*
- * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
- */
-
-b,
-strong {
-    font-weight: bold;
-}
-
-/*
- * Addresses styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/*
- * Addresses styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-
-/*
- * Corrects font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, serif;
-    font-size: 1em;
-}
-
-/*
- * Improves readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-
-/*
- * Sets consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/*
- * Addresses inconsistent and variable font size in all browsers.
- */
-
-small {
-    font-size: 80%;
-}
-
-/*
- * Prevents `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
-}
-
-sub {
-    bottom: -0.25em;
-}
-
-/* ==========================================================================
-   Embedded content
-   ========================================================================== */
-
-/*
- * Removes border when inside `a` element in IE 8/9.
- */
-
-img {
-    border: 0;
-}
-
-/*
- * Corrects overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
-   ========================================================================== */
-
-/*
- * Addresses margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/*
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/*
- * 1. Corrects color not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/*
- * 1. Corrects font family not being inherited in all browsers.
- * 2. Corrects font size not being inherited in all browsers.
- * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
- */
-
-button,
-input,
-select,
-textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
-}
-
-/*
- * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-button,
-input {
-    line-height: normal;
-}
-
-/*
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Corrects inability to style clickable `input` types in iOS.
- * 3. Improves usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
-}
-
-/*
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-input[disabled] {
-    cursor: default;
-}
-
-/*
- * 1. Addresses box sizing set to `content-box` in IE 8/9.
- * 2. Removes excess padding in IE 8/9.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/*
- * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/*
- * Removes inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/*
- * Removes inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
-/*
- * 1. Removes default vertical scrollbar in IE 8/9.
- * 2. Improves readability and alignment in all browsers.
- */
-
-textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
-}
-
-/* ==========================================================================
-   Tables
-   ========================================================================== */
-
-/*
- * Remove most spacing between table cells.
- */
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown
deleted file mode 100644
index 9e813661..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown
+++ /dev/null
@@ -1,9 +0,0 @@
-# SMACSS
-
-### Layout
-
-> CSS, by its very nature, is used to lay elements out on the page. However, there is a distinction between layouts dictating the major and minor components of a page. The minor components—such as a callout, or login form, or a navigation item—sit within the scope of major components such as a header or footer. I refer to the minor components as Modules [...] The major components are referred to as Layout styles.
-
-> - SMACSS, Jonathan Snook
-
-Use this directory for files that contain the CSS to layout major elements on the page. We typically use one file per major component and `@import` them in `style.css.scss`.
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown
deleted file mode 100644
index 2b394b8b..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown
+++ /dev/null
@@ -1,9 +0,0 @@
-# SMACSS
-
-### Modules
-
->  A Module is a more discrete component of the page. It is your navigation bars and your carousels and your dialogs and your widgets and so on. This is the meat of the page. Modules sit inside Layout components. Modules can sometimes sit within other Modules, too. Each Module should be designed to exist as a standalone component. In doing so, the page will be more flexible. If done right, Modules can easily be moved to different parts of the layout without breaking.
-
-> - SMACSS, Jonathan Snook
-
-In this directory we typically use one file per module.
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown
deleted file mode 100644
index c3e56e12..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown
+++ /dev/null
@@ -1,12 +0,0 @@
-# SMACSS
-
-### States
-
-> A state is something that augments and overrides all other styles. For example, an accordion section may be in a collapsed or expanded state. A message may be in a success or error state. [Modules and states] differ in two key ways:
-
-> 1. State styles can apply to layout and/or module styles; and
-> 2. State styles indicate a JavaScript dependency.
-
-> - SMACSS, Jonathan Snook
-
-State styles typically refer to styles that only exist on an element for a short period time, for example: styles for invalid form fields would go in `validations.scss`.
diff --git a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
deleted file mode 100644
index 15e36716..00000000
--- a/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// Import Base Styles
-@import "base/normalize"
-// @import "base/all_your"
-
-// Import Layout Styles
-// @import "layout/grid"
-
-// Import Module Styles
-// @import "modules/buttons"
-
-// Import State Styles
-// @import "states/validation"
diff --git a/middleman-core/lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/server.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/server.rb
index f8dd3323..27395fe4 100644
--- a/middleman-core/lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/server.rb
+++ b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/server.rb
@@ -21,7 +21,7 @@ module Padrino
 
     # Starts the application on the available server with specified options.
     def self.start(app, opts={})
-      options = {}.merge(opts) # We use a standard hash instead of Thor::CoreExt::HashWithIndifferentAccess
+      options = {}.merge(opts) # We use a standard hash instead of Middleman::Util::HashWithIndifferentAccess
       options.symbolize_keys!
       options[:Host] = options.delete(:host) || '127.0.0.1'
       options[:Port] = options.delete(:port) || 3000
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 4dd98a8e..91a214df 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
-  s.executable   = "middleman"
   s.require_path = "lib"
   s.required_ruby_version = '>= 1.9.3'
 
@@ -26,9 +25,6 @@ Gem::Specification.new do |s|
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.2"])
 
-  # CLI
-  s.add_dependency("thor", [">= 0.17.0", "< 2.0"])
-
   # Helpers
   s.add_dependency("activesupport", ["~> 4.0.1"])
 
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index dcbbd21f..5e334555 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_dependency("middleman-core", Middleman::VERSION)
+  s.add_dependency("middleman-cli", Middleman::VERSION)
   s.add_dependency("middleman-sprockets", ">= 3.1.2")
   s.add_dependency("haml", [">= 3.1.6"])
   s.add_dependency("sass", [">= 3.1.20"])