diff --git a/lib/motion/project/app.rb b/lib/motion/project/app.rb
index f9d88fc2..f512cbfa 100644
--- a/lib/motion/project/app.rb
+++ b/lib/motion/project/app.rb
@@ -117,7 +117,7 @@ module Motion; module Project
       def initialize(app_name, template_name)
         @name = @app_name = app_name
         @template_name = template_name
-        @template_directory = File.expand_path(File.join(__FILE__, "../../template/#{@template_name}"))
+        @template_directory = File.expand_path(File.join(__FILE__, "../template/#{@template_name}"))
 
         unless app_name.match(/^[\w\s-]+$/)
           fail "Invalid app name"
diff --git a/lib/motion/template/gem/README.md.erb b/lib/motion/project/template/gem/README.md.erb
similarity index 100%
rename from lib/motion/template/gem/README.md.erb
rename to lib/motion/project/template/gem/README.md.erb
diff --git a/lib/motion/template/gem/Rakefile.erb b/lib/motion/project/template/gem/Rakefile.erb
similarity index 100%
rename from lib/motion/template/gem/Rakefile.erb
rename to lib/motion/project/template/gem/Rakefile.erb
diff --git a/lib/motion/template/gem/app/app_delegate.rb b/lib/motion/project/template/gem/app/app_delegate.rb
similarity index 100%
rename from lib/motion/template/gem/app/app_delegate.rb
rename to lib/motion/project/template/gem/app/app_delegate.rb
diff --git a/lib/motion/template/gem/lib/project/{name}.rb.erb b/lib/motion/project/template/gem/lib/project/{name}.rb.erb
similarity index 100%
rename from lib/motion/template/gem/lib/project/{name}.rb.erb
rename to lib/motion/project/template/gem/lib/project/{name}.rb.erb
diff --git a/lib/motion/template/gem/lib/{name}.rb b/lib/motion/project/template/gem/lib/{name}.rb
similarity index 100%
rename from lib/motion/template/gem/lib/{name}.rb
rename to lib/motion/project/template/gem/lib/{name}.rb
diff --git a/lib/motion/template/gem/resources/Default-568h@2x.png b/lib/motion/project/template/gem/resources/Default-568h@2x.png
similarity index 100%
rename from lib/motion/template/gem/resources/Default-568h@2x.png
rename to lib/motion/project/template/gem/resources/Default-568h@2x.png
diff --git a/lib/motion/template/gem/spec/main_spec.rb.erb b/lib/motion/project/template/gem/spec/main_spec.rb.erb
similarity index 100%
rename from lib/motion/template/gem/spec/main_spec.rb.erb
rename to lib/motion/project/template/gem/spec/main_spec.rb.erb
diff --git a/lib/motion/template/gem/{name}.gemspec.erb b/lib/motion/project/template/gem/{name}.gemspec.erb
similarity index 100%
rename from lib/motion/template/gem/{name}.gemspec.erb
rename to lib/motion/project/template/gem/{name}.gemspec.erb
diff --git a/lib/motion/template/ios/.gitignore b/lib/motion/project/template/ios/.gitignore
similarity index 100%
rename from lib/motion/template/ios/.gitignore
rename to lib/motion/project/template/ios/.gitignore
diff --git a/lib/motion/template/ios/Rakefile.erb b/lib/motion/project/template/ios/Rakefile.erb
similarity index 100%
rename from lib/motion/template/ios/Rakefile.erb
rename to lib/motion/project/template/ios/Rakefile.erb
diff --git a/lib/motion/template/ios/app/app_delegate.rb b/lib/motion/project/template/ios/app/app_delegate.rb
similarity index 100%
rename from lib/motion/template/ios/app/app_delegate.rb
rename to lib/motion/project/template/ios/app/app_delegate.rb
diff --git a/lib/motion/template/ios/resources/Default-568h@2x.png b/lib/motion/project/template/ios/resources/Default-568h@2x.png
similarity index 100%
rename from lib/motion/template/ios/resources/Default-568h@2x.png
rename to lib/motion/project/template/ios/resources/Default-568h@2x.png
diff --git a/lib/motion/template/ios/spec/main_spec.rb.erb b/lib/motion/project/template/ios/spec/main_spec.rb.erb
similarity index 100%
rename from lib/motion/template/ios/spec/main_spec.rb.erb
rename to lib/motion/project/template/ios/spec/main_spec.rb.erb