diff --git a/cookiecutter.json b/cookiecutter.json
index 7d2e4831e40a07c9810ed9a061d55fd743e47381..f697d82d19e49ec5aa751ac13f833ecb66b6d468 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -3,7 +3,7 @@
 	"email": "sloria1@gmail.com",
 	"github_username": "sloria",
 	"project_name": "My Flask App",
-	"repo_name": "myflaskapp",
+	"app_name": "myflaskapp",
 	"project_short_description": "A flasky app.",
 	"year": "2013"
 }
diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.app_name}}/.gitignore
similarity index 100%
rename from {{cookiecutter.repo_name}}/.gitignore
rename to {{cookiecutter.app_name}}/.gitignore
diff --git a/{{cookiecutter.repo_name}}/.travis.yml b/{{cookiecutter.app_name}}/.travis.yml
similarity index 100%
rename from {{cookiecutter.repo_name}}/.travis.yml
rename to {{cookiecutter.app_name}}/.travis.yml
diff --git a/{{cookiecutter.repo_name}}/LICENSE b/{{cookiecutter.app_name}}/LICENSE
similarity index 100%
rename from {{cookiecutter.repo_name}}/LICENSE
rename to {{cookiecutter.app_name}}/LICENSE
diff --git a/{{cookiecutter.app_name}}/Procfile b/{{cookiecutter.app_name}}/Procfile
new file mode 100644
index 0000000000000000000000000000000000000000..aaf74edf022cbd9fc176d4f7d3301b350e47bf84
--- /dev/null
+++ b/{{cookiecutter.app_name}}/Procfile
@@ -0,0 +1 @@
+web: gunicorn {{cookiecutter.app_name}}.app:create_app\(\) -b 0.0.0.0:$PORT -w 3
diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.app_name}}/README.rst
similarity index 83%
rename from {{cookiecutter.repo_name}}/README.rst
rename to {{cookiecutter.app_name}}/README.rst
index 57d6cdcc507c6278ead2f29ef36d9439e32280dc..ea94d66247b5b3be2907c55e6cb8ad166361e33c 100644
--- a/{{cookiecutter.repo_name}}/README.rst
+++ b/{{cookiecutter.app_name}}/README.rst
@@ -10,8 +10,8 @@ Quickstart
 
 ::
 
-    git clone https://github.com/{{cookiecutter.github_username}}/{{ cookiecutter.repo_name }}
-    cd {{cookiecutter.repo_name}}
+    git clone https://github.com/{{cookiecutter.github_username}}/{{ cookiecutter.app_name }}
+    cd {{cookiecutter.app_name}}
     pip install -r requirements/dev.txt
     python manage.py db init
     python manage.py db migrate
@@ -23,7 +23,7 @@ Quickstart
 Deployment
 ----------
 
-In your production environment, make sure the ``{{cookiecutter.repo_name|upper}}_ENV`` environment variable is set to ``"prod"``.
+In your production environment, make sure the ``{{cookiecutter.app_name|upper}}_ENV`` environment variable is set to ``"prod"``.
 
 
 Shell
diff --git a/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.app_name}}/manage.py
similarity index 78%
rename from {{cookiecutter.repo_name}}/manage.py
rename to {{cookiecutter.app_name}}/manage.py
index 5c366d0262aff6b856b271790f6a7d99573b84d0..9fd9e351ba07c7e51e82ffed36e1bd90336fa2ea 100644
--- a/{{cookiecutter.repo_name}}/manage.py
+++ b/{{cookiecutter.app_name}}/manage.py
@@ -6,11 +6,11 @@ import subprocess
 from flask.ext.script import Manager, Shell, Server
 from flask.ext.migrate import MigrateCommand
 
-from {{cookiecutter.repo_name}}.app import create_app
-from {{cookiecutter.repo_name}}.settings import DevConfig, ProdConfig
-from {{cookiecutter.repo_name}}.database import db
+from {{cookiecutter.app_name}}.app import create_app
+from {{cookiecutter.app_name}}.settings import DevConfig, ProdConfig
+from {{cookiecutter.app_name}}.database import db
 
-if os.environ.get("{{cookiecutter.repo_name | upper}}_ENV") == 'prod':
+if os.environ.get("{{cookiecutter.app_name | upper}}_ENV") == 'prod':
     app = create_app(ProdConfig)
 else:
     app = create_app(DevConfig)
diff --git a/{{cookiecutter.repo_name}}/requirements.txt b/{{cookiecutter.app_name}}/requirements.txt
similarity index 100%
rename from {{cookiecutter.repo_name}}/requirements.txt
rename to {{cookiecutter.app_name}}/requirements.txt
diff --git a/{{cookiecutter.repo_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt
similarity index 100%
rename from {{cookiecutter.repo_name}}/requirements/dev.txt
rename to {{cookiecutter.app_name}}/requirements/dev.txt
diff --git a/{{cookiecutter.repo_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt
similarity index 100%
rename from {{cookiecutter.repo_name}}/requirements/prod.txt
rename to {{cookiecutter.app_name}}/requirements/prod.txt
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/__init__.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/app.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py
similarity index 83%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/app.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py
index daa7b8890f73e4971dbad02419ab04414584a0ee..cd2aa2db8c1fd570407fe4a37ee09d6eba5f5488 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/app.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py
@@ -3,11 +3,11 @@
 from flask import Flask, render_template
 from flask_debugtoolbar import DebugToolbarExtension
 
-from {{cookiecutter.repo_name}}.settings import ProdConfig
-from {{cookiecutter.repo_name}}.assets import assets
-from {{cookiecutter.repo_name}}.extensions import (db, login_manager, migrate,
+from {{cookiecutter.app_name}}.settings import ProdConfig
+from {{cookiecutter.app_name}}.assets import assets
+from {{cookiecutter.app_name}}.extensions import (db, login_manager, migrate,
                                                     cache)
-from {{cookiecutter.repo_name}} import public, user
+from {{cookiecutter.app_name}} import public, user
 
 
 def create_app(config_object=ProdConfig):
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/assets.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/assets.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/assets.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/database.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/database.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/extensions.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/extensions.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/extensions.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/__init__.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/__init__.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/forms.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/forms.py
similarity index 94%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/forms.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/forms.py
index 6553a87c2ea35b372c784d019fedfcc312a1c8a0..5659c74edca33ce97b3987a38bbf848634f1b908 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/forms.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/forms.py
@@ -2,7 +2,7 @@ from flask_wtf import Form
 from wtforms import TextField, PasswordField
 from wtforms.validators import DataRequired
 
-from {{cookiecutter.repo_name}}.user.models import User
+from {{cookiecutter.app_name}}.user.models import User
 
 class LoginForm(Form):
     username = TextField('Username', validators=[DataRequired()])
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/views.py
similarity index 84%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/views.py
index c2cf9efc5b26e3f08e1247092f5360d0070b2658..18f75ab6532b70340223815ca9da2ae362cf1a9a 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/public/views.py
@@ -4,12 +4,12 @@ from flask import (Blueprint, request, render_template, flash, url_for,
                     redirect, session)
 from flask.ext.login import login_user, login_required, logout_user
 
-from {{cookiecutter.repo_name}}.extensions import login_manager
-from {{cookiecutter.repo_name}}.user.models import User
-from {{cookiecutter.repo_name}}.public.forms import LoginForm
-from {{cookiecutter.repo_name}}.user.forms import RegisterForm
-from {{cookiecutter.repo_name}}.utils import flash_errors
-from {{cookiecutter.repo_name}}.database import db
+from {{cookiecutter.app_name}}.extensions import login_manager
+from {{cookiecutter.app_name}}.user.models import User
+from {{cookiecutter.app_name}}.public.forms import LoginForm
+from {{cookiecutter.app_name}}.user.forms import RegisterForm
+from {{cookiecutter.app_name}}.utils import flash_errors
+from {{cookiecutter.app_name}}.database import db
 
 blueprint = Blueprint('public', __name__, static_folder="../static")
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/settings.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/settings.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/style.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/css/style.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/style.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/css/style.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/plugins.js b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/js/plugins.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/plugins.js
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/js/plugins.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/script.js b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/js/script.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/script.js
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/js/script.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap-theme.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap-theme.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap-theme.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap-theme.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap-theme.min.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap-theme.min.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap-theme.min.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap-theme.min.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap.min.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap.min.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/css/bootstrap.min.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/css/bootstrap.min.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.eot b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.eot
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.eot
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.svg b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.svg
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.svg
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.ttf b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.ttf
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.ttf
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.woff b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.woff
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/fonts/glyphicons-halflings-regular.woff
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/js/bootstrap.js b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/js/bootstrap.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/js/bootstrap.js
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/js/bootstrap.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/js/bootstrap.min.js b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/js/bootstrap.min.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/bootstrap3/js/bootstrap.min.js
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/bootstrap3/js/bootstrap.min.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/css/font-awesome.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/css/font-awesome.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/css/font-awesome.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/css/font-awesome.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/css/font-awesome.min.css b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/css/font-awesome.min.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/css/font-awesome.min.css
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/css/font-awesome.min.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/FontAwesome.otf b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/FontAwesome.otf
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/FontAwesome.otf
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/FontAwesome.otf
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.eot b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.eot
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.eot
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.eot
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.svg b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.svg
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.svg
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.svg
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.ttf b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.ttf
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.ttf
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.woff b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.woff
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.woff
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/font-awesome4/fonts/fontawesome-webfont.woff
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/jquery2/jquery-2.0.3.min.js b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/jquery2/jquery-2.0.3.min.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/libs/jquery2/jquery-2.0.3.min.js
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/libs/jquery2/jquery-2.0.3.min.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/.gitkeep b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/.gitkeep
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/.gitkeep
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/.gitkeep
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/css/.gitkeep b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/css/.gitkeep
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/css/.gitkeep
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/css/.gitkeep
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/js/.gitkeep b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/js/.gitkeep
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/public/js/.gitkeep
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/static/public/js/.gitkeep
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/401.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/401.html
similarity index 92%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/401.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/401.html
index 3f45f7f5ad89e97c93b853500c7af8764c0b7114..dcbc89df45c6e20ef7434418fcce4dadadc7b17e 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/401.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/401.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 
 {% block page_title %}Unauthorized{% endblock %}
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/404.html
similarity index 90%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/404.html
index 4d4913811834f8f6ee5d409a10d2fb31d2eb1b70..8a325d4fa5553e5975ce88589c6d6241bea09c4d 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/404.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 
 {% block page_title %}Page Not Found{% endblock %}
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/500.html
similarity index 90%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/500.html
index db0696d175d32d9544a12a07a46bcf8640ae70e7..74509d053aa8da70c196526d4d60e8f099ed1e0e 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/500.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 
 {% block page_title %}Server error{% endblock %}
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/footer.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/footer.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/footer.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/footer.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/base.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/layout.html
similarity index 96%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/base.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/layout.html
index 6a9a63edc792e26ea4d22053206c241288c93d3d..1fefc038667459a43d86bbdd5e12dae4eff83c7b 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/base.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/layout.html
@@ -31,7 +31,7 @@
 <body class="{% block body_class %}{% endblock %}">
 {% block body %}
 {% with form=form  %}
-{% include "_layouts/nav.html" %}
+{% include "nav.html" %}
 {% endwith %}
 
 <header>{% block header %}{% endblock %}</header>
@@ -58,7 +58,7 @@
 
 </div><!-- end container -->
 
-{% include "_layouts/footer.html" %}
+{% include "footer.html" %}
 
 <!-- JavaScript at the bottom for fast page loading -->
 {% assets "js_all" %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/nav.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/nav.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/about.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/about.html
similarity index 88%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/about.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/about.html
index fe6aa768914f2d06a34ee26bbb13b7fa802dc2d2..1d31fad28b202ca73140b3ccdd0423d39fe40068 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/about.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/about.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 
 {% block content %}
 <div class="body-content">
@@ -9,4 +9,4 @@
     </div>
 </div>
 {% endblock %}
-{% endraw %}
\ No newline at end of file
+{% endraw %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/home.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/home.html
similarity index 97%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/home.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/home.html
index c14038117c74bd49054d4f73ba51af08cc50e5c8..d26aff1e3e513402a471ed28d83027e8b9608647 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/home.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/home.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 {% block content %}
 <!-- Main jumbotron for a primary marketing message or call to action -->
 <div class="jumbotron">
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html
similarity index 97%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html
index 7c2bb0736122010de91177dbd854cdafb3886d34..7f3f11905e37802d2c629f878aa5c578207213d1 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html
@@ -1,5 +1,5 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 {% block content %}
 <div class="container-narrow">
   <h1>Register</h1>
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/members.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/users/members.html
similarity index 74%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/members.html
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/users/members.html
index 7a60bf447d427aba0d0f42cd02167d72d71093e6..dc2b897d913319796ff08ead219fd65a13e560ea 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/members.html
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/users/members.html
@@ -1,7 +1,7 @@
 {% raw %}
-{% extends "_layouts/base.html" %}
+{% extends "layout.html" %}
 {% block content %}
     <h1>Welcome {{ session.username }}</h1>
     <h3>This is the members-only page.</h3>
 {% endblock %}
-{% endraw%}
\ No newline at end of file
+{% endraw%}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/__init__.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/__init__.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/base.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/base.py
similarity index 74%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/base.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/base.py
index 4f154e75233d1659b47097b866a5685d4bff122f..7bbccd922c28f06a5ca1fab867c0b6d32520c4ca 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/base.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/base.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from flask.ext.testing import TestCase
-from {{ cookiecutter.repo_name }}.settings import Config
-from {{ cookiecutter.repo_name }}.app import create_app
-from {{ cookiecutter.repo_name }}.database import db
+from {{ cookiecutter.app_name }}.settings import Config
+from {{ cookiecutter.app_name }}.app import create_app
+from {{ cookiecutter.app_name }}.database import db
 
 
 class TestConfig(Config):
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/factories.py
similarity index 80%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/factories.py
index 9416e96c2fe9d0b1fa91b4e5bb534d49b8f2c973..4d6ed5d1366f3aa351fe170383f64619f9030af3 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/factories.py
@@ -2,8 +2,8 @@
 from factory import Sequence, PostGenerationMethodCall
 from factory.alchemy import SQLAlchemyModelFactory
 
-from {{cookiecutter.repo_name}}.user.models import User
-from {{cookiecutter.repo_name}}.database import db
+from {{cookiecutter.app_name}}.user.models import User
+from {{cookiecutter.app_name}}.database import db
 
 
 class UserFactory(SQLAlchemyModelFactory):
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/test_models.py
similarity index 87%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/test_models.py
index 1ea3f6f0b06ff8481493721db6655bde4525e652..8909efe5646b0bdafa30dc9544c5f7570e65dadd 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/test_models.py
@@ -2,8 +2,8 @@
 import unittest
 from nose.tools import *  # PEP8 asserts
 
-from {{ cookiecutter.repo_name }}.database import db
-from {{ cookiecutter.repo_name }}.user.models import User
+from {{ cookiecutter.app_name }}.database import db
+from {{ cookiecutter.app_name }}.user.models import User
 from .base import DbTestCase
 from .factories import UserFactory
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/webtest_tests.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/tests/webtest_tests.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/__init__.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/__init__.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/forms.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/forms.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/forms.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/forms.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/models.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py
similarity index 90%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/models.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py
index c8f73d6443709dacde414dad31ca1e2b2b78a336..8d761b33fa0ebd46146b61a5eaad83c689d4b6c3 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/models.py
+++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py
@@ -3,8 +3,8 @@ import datetime as dt
 
 from flask.ext.login import UserMixin
 
-from {{cookiecutter.repo_name}}.database import db, CRUDMixin
-from {{cookiecutter.repo_name}}.extensions import bcrypt
+from {{cookiecutter.app_name}}.database import db, CRUDMixin
+from {{cookiecutter.app_name}}.extensions import bcrypt
 
 
 class User(UserMixin, CRUDMixin,  db.Model):
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/views.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/views.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/views.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/views.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/utils.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/utils.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/utils.py
rename to {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/utils.py
diff --git a/{{cookiecutter.repo_name}}/Procfile b/{{cookiecutter.repo_name}}/Procfile
deleted file mode 100644
index 7f3d32e3cf26e411cd547d601efd366e3908a63e..0000000000000000000000000000000000000000
--- a/{{cookiecutter.repo_name}}/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: gunicorn {{cookiecutter.repo_name}}.app:create_app\(\) -b 0.0.0.0:$PORT -w 3