diff --git a/.rubocop.yml b/.rubocop.yml
index 4ac61fa8..100c188c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,7 @@ AllCops:
     - '**/bin/**/*'
     - 'middleman-core/lib/middleman-core/step_definitions/**/*'
     - 'middleman-core/lib/vendored-middleman-deps/**/*'
-    - 'middleman-templates/lib/middleman-templates/**/*'
+    - 'middleman-cli/lib/middleman-templates/**/*'
     - 'middleman-core/fixtures/**/*'
     - 'middleman-core/features/**/*'
     - 'middleman-core/spec/**/*'
diff --git a/Gemfile b/Gemfile
index c2d1da66..37505ff9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,5 @@ gem 'rubocop', require: false
 # Middleman itself
 gem 'middleman-core', path: 'middleman-core'
 gem 'middleman-cli', path: 'middleman-cli'
-gem 'middleman-templates', path: 'middleman-templates'
 gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', require: false
 gem 'middleman', path: 'middleman'
diff --git a/Rakefile b/Rakefile
index 357bc7aa..b48c1b51 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,7 +6,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-templates middleman-cli middleman)
+middleman_gems = %w(middleman-core middleman-cli middleman)
 GEM_PATHS = middleman_gems.freeze
 
 def sh_rake(command)
diff --git a/middleman-templates/lib/middleman-templates.rb b/middleman-cli/lib/middleman-templates.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates.rb
rename to middleman-cli/lib/middleman-templates.rb
diff --git a/middleman-templates/lib/middleman-templates/default.rb b/middleman-cli/lib/middleman-templates/default.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default.rb
rename to middleman-cli/lib/middleman-templates/default.rb
diff --git a/middleman-templates/lib/middleman-templates/default/source/images/background.png b/middleman-cli/lib/middleman-templates/default/source/images/background.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/images/background.png
rename to middleman-cli/lib/middleman-templates/default/source/images/background.png
diff --git a/middleman-templates/lib/middleman-templates/default/source/images/middleman.png b/middleman-cli/lib/middleman-templates/default/source/images/middleman.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/images/middleman.png
rename to middleman-cli/lib/middleman-templates/default/source/images/middleman.png
diff --git a/middleman-templates/lib/middleman-templates/default/source/index.html.erb b/middleman-cli/lib/middleman-templates/default/source/index.html.erb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/index.html.erb
rename to middleman-cli/lib/middleman-templates/default/source/index.html.erb
diff --git a/middleman-templates/lib/middleman-templates/default/source/javascripts/all.js b/middleman-cli/lib/middleman-templates/default/source/javascripts/all.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/javascripts/all.js
rename to middleman-cli/lib/middleman-templates/default/source/javascripts/all.js
diff --git a/middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb b/middleman-cli/lib/middleman-templates/default/source/layouts/layout.erb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/layouts/layout.erb
rename to middleman-cli/lib/middleman-templates/default/source/layouts/layout.erb
diff --git a/middleman-templates/lib/middleman-templates/default/source/stylesheets/all.css b/middleman-cli/lib/middleman-templates/default/source/stylesheets/all.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/stylesheets/all.css
rename to middleman-cli/lib/middleman-templates/default/source/stylesheets/all.css
diff --git a/middleman-templates/lib/middleman-templates/default/source/stylesheets/normalize.css b/middleman-cli/lib/middleman-templates/default/source/stylesheets/normalize.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/default/source/stylesheets/normalize.css
rename to middleman-cli/lib/middleman-templates/default/source/stylesheets/normalize.css
diff --git a/middleman-templates/lib/middleman-templates/empty.rb b/middleman-cli/lib/middleman-templates/empty.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/empty.rb
rename to middleman-cli/lib/middleman-templates/empty.rb
diff --git a/middleman-templates/lib/middleman-templates/html5.rb b/middleman-cli/lib/middleman-templates/html5.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5.rb
rename to middleman-cli/lib/middleman-templates/html5.rb
diff --git a/middleman-templates/lib/middleman-templates/html5/source/.htaccess b/middleman-cli/lib/middleman-templates/html5/source/.htaccess
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/.htaccess
rename to middleman-cli/lib/middleman-templates/html5/source/.htaccess
diff --git a/middleman-templates/lib/middleman-templates/html5/source/404.html b/middleman-cli/lib/middleman-templates/html5/source/404.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/404.html
rename to middleman-cli/lib/middleman-templates/html5/source/404.html
diff --git a/middleman-templates/lib/middleman-templates/html5/source/CHANGELOG.md b/middleman-cli/lib/middleman-templates/html5/source/CHANGELOG.md
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/CHANGELOG.md
rename to middleman-cli/lib/middleman-templates/html5/source/CHANGELOG.md
diff --git a/middleman-templates/lib/middleman-templates/html5/source/CONTRIBUTING.md b/middleman-cli/lib/middleman-templates/html5/source/CONTRIBUTING.md
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/CONTRIBUTING.md
rename to middleman-cli/lib/middleman-templates/html5/source/CONTRIBUTING.md
diff --git a/middleman-templates/lib/middleman-templates/html5/source/LICENSE.md b/middleman-cli/lib/middleman-templates/html5/source/LICENSE.md
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/LICENSE.md
rename to middleman-cli/lib/middleman-templates/html5/source/LICENSE.md
diff --git a/middleman-templates/lib/middleman-templates/html5/source/README.md b/middleman-cli/lib/middleman-templates/html5/source/README.md
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/README.md
rename to middleman-cli/lib/middleman-templates/html5/source/README.md
diff --git a/middleman-templates/lib/middleman-templates/html5/source/apple-touch-icon-precomposed.png b/middleman-cli/lib/middleman-templates/html5/source/apple-touch-icon-precomposed.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/apple-touch-icon-precomposed.png
rename to middleman-cli/lib/middleman-templates/html5/source/apple-touch-icon-precomposed.png
diff --git a/middleman-templates/lib/middleman-templates/html5/source/crossdomain.xml b/middleman-cli/lib/middleman-templates/html5/source/crossdomain.xml
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/crossdomain.xml
rename to middleman-cli/lib/middleman-templates/html5/source/crossdomain.xml
diff --git a/middleman-templates/lib/middleman-templates/html5/source/css/main.css b/middleman-cli/lib/middleman-templates/html5/source/css/main.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/css/main.css
rename to middleman-cli/lib/middleman-templates/html5/source/css/main.css
diff --git a/middleman-templates/lib/middleman-templates/html5/source/css/normalize.css b/middleman-cli/lib/middleman-templates/html5/source/css/normalize.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/css/normalize.css
rename to middleman-cli/lib/middleman-templates/html5/source/css/normalize.css
diff --git a/middleman-templates/lib/middleman-templates/html5/source/favicon.ico b/middleman-cli/lib/middleman-templates/html5/source/favicon.ico
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/favicon.ico
rename to middleman-cli/lib/middleman-templates/html5/source/favicon.ico
diff --git a/middleman-templates/lib/middleman-templates/html5/source/humans.txt b/middleman-cli/lib/middleman-templates/html5/source/humans.txt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/humans.txt
rename to middleman-cli/lib/middleman-templates/html5/source/humans.txt
diff --git a/middleman-templates/lib/middleman-templates/html5/source/img/.gitignore b/middleman-cli/lib/middleman-templates/html5/source/img/.gitignore
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/img/.gitignore
rename to middleman-cli/lib/middleman-templates/html5/source/img/.gitignore
diff --git a/middleman-templates/lib/middleman-templates/html5/source/index.html.erb b/middleman-cli/lib/middleman-templates/html5/source/index.html.erb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/index.html.erb
rename to middleman-cli/lib/middleman-templates/html5/source/index.html.erb
diff --git a/middleman-templates/lib/middleman-templates/html5/source/js/main.js b/middleman-cli/lib/middleman-templates/html5/source/js/main.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/js/main.js
rename to middleman-cli/lib/middleman-templates/html5/source/js/main.js
diff --git a/middleman-templates/lib/middleman-templates/html5/source/js/plugins.js b/middleman-cli/lib/middleman-templates/html5/source/js/plugins.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/js/plugins.js
rename to middleman-cli/lib/middleman-templates/html5/source/js/plugins.js
diff --git a/middleman-templates/lib/middleman-templates/html5/source/js/vendor/jquery-1.11.0.min.js b/middleman-cli/lib/middleman-templates/html5/source/js/vendor/jquery-1.11.0.min.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/js/vendor/jquery-1.11.0.min.js
rename to middleman-cli/lib/middleman-templates/html5/source/js/vendor/jquery-1.11.0.min.js
diff --git a/middleman-templates/lib/middleman-templates/html5/source/js/vendor/modernizr-2.7.1.min.js b/middleman-cli/lib/middleman-templates/html5/source/js/vendor/modernizr-2.7.1.min.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/js/vendor/modernizr-2.7.1.min.js
rename to middleman-cli/lib/middleman-templates/html5/source/js/vendor/modernizr-2.7.1.min.js
diff --git a/middleman-templates/lib/middleman-templates/html5/source/layouts/layout.erb b/middleman-cli/lib/middleman-templates/html5/source/layouts/layout.erb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/layouts/layout.erb
rename to middleman-cli/lib/middleman-templates/html5/source/layouts/layout.erb
diff --git a/middleman-templates/lib/middleman-templates/html5/source/robots.txt b/middleman-cli/lib/middleman-templates/html5/source/robots.txt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/html5/source/robots.txt
rename to middleman-cli/lib/middleman-templates/html5/source/robots.txt
diff --git a/middleman-templates/lib/middleman-templates/local.rb b/middleman-cli/lib/middleman-templates/local.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/local.rb
rename to middleman-cli/lib/middleman-templates/local.rb
diff --git a/middleman-templates/lib/middleman-templates/mobile.rb b/middleman-cli/lib/middleman-templates/mobile.rb
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile.rb
rename to middleman-cli/lib/middleman-templates/mobile.rb
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/404.html b/middleman-cli/lib/middleman-templates/mobile/source/404.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/404.html
rename to middleman-cli/lib/middleman-templates/mobile/source/404.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/README.markdown b/middleman-cli/lib/middleman-templates/mobile/source/README.markdown
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/README.markdown
rename to middleman-cli/lib/middleman-templates/mobile/source/README.markdown
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/crossdomain.xml b/middleman-cli/lib/middleman-templates/mobile/source/crossdomain.xml
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/crossdomain.xml
rename to middleman-cli/lib/middleman-templates/mobile/source/crossdomain.xml
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/css/style.css b/middleman-cli/lib/middleman-templates/mobile/source/css/style.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/css/style.css
rename to middleman-cli/lib/middleman-templates/mobile/source/css/style.css
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/humans.txt b/middleman-cli/lib/middleman-templates/mobile/source/humans.txt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/humans.txt
rename to middleman-cli/lib/middleman-templates/mobile/source/humans.txt
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/h/apple-touch-icon.png b/middleman-cli/lib/middleman-templates/mobile/source/img/h/apple-touch-icon.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/h/apple-touch-icon.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/h/apple-touch-icon.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/h/splash.png b/middleman-cli/lib/middleman-templates/mobile/source/img/h/splash.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/h/splash.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/h/splash.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/l/apple-touch-icon-precomposed.png b/middleman-cli/lib/middleman-templates/mobile/source/img/l/apple-touch-icon-precomposed.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/l/apple-touch-icon-precomposed.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/l/apple-touch-icon-precomposed.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/l/apple-touch-icon.png b/middleman-cli/lib/middleman-templates/mobile/source/img/l/apple-touch-icon.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/l/apple-touch-icon.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/l/apple-touch-icon.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/l/splash.png b/middleman-cli/lib/middleman-templates/mobile/source/img/l/splash.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/l/splash.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/l/splash.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/img/m/apple-touch-icon.png b/middleman-cli/lib/middleman-templates/mobile/source/img/m/apple-touch-icon.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/img/m/apple-touch-icon.png
rename to middleman-cli/lib/middleman-templates/mobile/source/img/m/apple-touch-icon.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/index.html b/middleman-cli/lib/middleman-templates/mobile/source/index.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/index.html
rename to middleman-cli/lib/middleman-templates/mobile/source/index.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/js/libs/modernizr-custom.js b/middleman-cli/lib/middleman-templates/mobile/source/js/libs/modernizr-custom.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/js/libs/modernizr-custom.js
rename to middleman-cli/lib/middleman-templates/mobile/source/js/libs/modernizr-custom.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/js/libs/respond.min.js b/middleman-cli/lib/middleman-templates/mobile/source/js/libs/respond.min.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/js/libs/respond.min.js
rename to middleman-cli/lib/middleman-templates/mobile/source/js/libs/respond.min.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/js/mylibs/helper.js b/middleman-cli/lib/middleman-templates/mobile/source/js/mylibs/helper.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/js/mylibs/helper.js
rename to middleman-cli/lib/middleman-templates/mobile/source/js/mylibs/helper.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/js/plugins.js b/middleman-cli/lib/middleman-templates/mobile/source/js/plugins.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/js/plugins.js
rename to middleman-cli/lib/middleman-templates/mobile/source/js/plugins.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/js/script.js b/middleman-cli/lib/middleman-templates/mobile/source/js/script.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/js/script.js
rename to middleman-cli/lib/middleman-templates/mobile/source/js/script.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/robots.txt b/middleman-cli/lib/middleman-templates/mobile/source/robots.txt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/robots.txt
rename to middleman-cli/lib/middleman-templates/mobile/source/robots.txt
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/sitemap.xml b/middleman-cli/lib/middleman-templates/mobile/source/sitemap.xml
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/sitemap.xml
rename to middleman-cli/lib/middleman-templates/mobile/source/sitemap.xml
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/test/index.html b/middleman-cli/lib/middleman-templates/mobile/source/test/index.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/test/index.html
rename to middleman-cli/lib/middleman-templates/mobile/source/test/index.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/test/qunit/qunit.css b/middleman-cli/lib/middleman-templates/mobile/source/test/qunit/qunit.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/test/qunit/qunit.css
rename to middleman-cli/lib/middleman-templates/mobile/source/test/qunit/qunit.css
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/test/qunit/qunit.js b/middleman-cli/lib/middleman-templates/mobile/source/test/qunit/qunit.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/test/qunit/qunit.js
rename to middleman-cli/lib/middleman-templates/mobile/source/test/qunit/qunit.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/test/tests.js b/middleman-cli/lib/middleman-templates/mobile/source/test/tests.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/test/tests.js
rename to middleman-cli/lib/middleman-templates/mobile/source/test/tests.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/Readme.PDF
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx1.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/aspx2.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/ga.aspx
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/aspx/sample.aspx
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/ga.jsp
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp1.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/jsp2.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/jsp/sample.jsp
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/ga.php b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/ga.php
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php1.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/php2.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/sample.php b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/php/sample.php
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/ga.pl
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl1.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/perl2.snippet
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl b/middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/googleanalyticsformobile/pl/sample.pl
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/COPYING b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/COPYING
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/bookmark_bubble.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/example/example.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/arrow.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/close.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/generate_base64_images
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png b/middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/mobile-bookmark-bubble/images/icon_calendar.png
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/README b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/README
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/README
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/README
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/databasefactory.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/databasefactory.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/databasefactory.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/databasefactory.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworker.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworker.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworker.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworker.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworker_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworker_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworker_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworker_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworkerstarter.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworkerstarter.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbworkerstarter.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbworkerstarter.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_gears_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapper_html5_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/dbwrapperapi_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_resultset_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gears_transaction_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gearsutils.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gearsutils.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gearsutils.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gearsutils.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gearsutils_test.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gearsutils_test.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/gearsutils_test.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/gearsutils_test.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/global_functions.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/global_functions.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/global_functions.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/global_functions.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/index.html b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/index.html
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/index.html
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/index.html
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/simplenotes.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/simplenotes.js
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/styles.css b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/styles.css
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/styles.css
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/styles.css
diff --git a/middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/template.js b/middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/template.js
similarity index 100%
rename from middleman-templates/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/template.js
rename to middleman-cli/lib/middleman-templates/mobile/source/tools/wspl/simplenotes/template.js
diff --git a/middleman-templates/lib/middleman-templates/shared/Gemfile.tt b/middleman-cli/lib/middleman-templates/shared/Gemfile.tt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/shared/Gemfile.tt
rename to middleman-cli/lib/middleman-templates/shared/Gemfile.tt
diff --git a/middleman-templates/lib/middleman-templates/shared/config.ru b/middleman-cli/lib/middleman-templates/shared/config.ru
similarity index 100%
rename from middleman-templates/lib/middleman-templates/shared/config.ru
rename to middleman-cli/lib/middleman-templates/shared/config.ru
diff --git a/middleman-templates/lib/middleman-templates/shared/config.tt b/middleman-cli/lib/middleman-templates/shared/config.tt
similarity index 100%
rename from middleman-templates/lib/middleman-templates/shared/config.tt
rename to middleman-cli/lib/middleman-templates/shared/config.tt
diff --git a/middleman-templates/lib/middleman-templates/shared/gitignore b/middleman-cli/lib/middleman-templates/shared/gitignore
similarity index 100%
rename from middleman-templates/lib/middleman-templates/shared/gitignore
rename to middleman-cli/lib/middleman-templates/shared/gitignore
diff --git a/middleman-cli/middleman-cli.gemspec b/middleman-cli/middleman-cli.gemspec
index 05f5c456..8102ed15 100644
--- a/middleman-cli/middleman-cli.gemspec
+++ b/middleman-cli/middleman-cli.gemspec
@@ -21,4 +21,7 @@ Gem::Specification.new do |s|
 
   # CLI
   s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])
+
+  # Templates
+  s.add_dependency('octokit', ['~> 3.1'])
 end
diff --git a/middleman-templates/.gemtest b/middleman-templates/.gemtest
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman-templates/.simplecov b/middleman-templates/.simplecov
deleted file mode 100644
index 3720cc52..00000000
--- a/middleman-templates/.simplecov
+++ /dev/null
@@ -1,5 +0,0 @@
-SimpleCov.start do
-  add_filter '/fixtures/'
-  add_filter '/features/'
-  add_filter '/spec/'
-end
\ No newline at end of file
diff --git a/middleman-templates/.yardopts b/middleman-templates/.yardopts
deleted file mode 100644
index fcefc936..00000000
--- a/middleman-templates/.yardopts
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/**/*.rb
---exclude lib/middleman-templates
---no-private
---hide-void-return
---markup=markdown
\ No newline at end of file
diff --git a/middleman-templates/Rakefile b/middleman-templates/Rakefile
deleted file mode 100644
index 7fc3d2c0..00000000
--- a/middleman-templates/Rakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-GEM_NAME = 'middleman-templates'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
diff --git a/middleman-templates/features/.gitkeep b/middleman-templates/features/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman-templates/fixtures/.gitkeep b/middleman-templates/fixtures/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman-templates/middleman-templates.gemspec b/middleman-templates/middleman-templates.gemspec
deleted file mode 100644
index ee0bcde0..00000000
--- a/middleman-templates/middleman-templates.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require File.expand_path('../../middleman-core/lib/middleman-core/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = 'middleman-templates'
-  s.version     = Middleman::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.license     = 'MIT'
-  s.authors     = ['Thomas Reynolds', 'Ben Hollis', 'Karl Freeman']
-  s.email       = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
-  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.require_path = 'lib'
-  s.required_ruby_version = '>= 1.9.3'
-
-  # Templates
-  s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])
-end
diff --git a/middleman-templates/spec/middleman/.gitkeep b/middleman-templates/spec/middleman/.gitkeep
deleted file mode 100644
index 45adbb22..00000000
--- a/middleman-templates/spec/middleman/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-.gitkeep
\ No newline at end of file
diff --git a/middleman-templates/spec/spec_helper.rb b/middleman-templates/spec/spec_helper.rb
deleted file mode 100644
index e69de29b..00000000
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index bdb77455..e0268027 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('middleman-core', Middleman::VERSION)
   s.add_dependency('middleman-cli', Middleman::VERSION)
-  s.add_dependency('middleman-templates', Middleman::VERSION)
   s.add_dependency('middleman-sprockets', '>= 3.1.2')
   s.add_dependency('haml', ['>= 4.0.5'])
   s.add_dependency('sass', ['>= 3.3.4'])