diff --git a/cookiecutter.json b/cookiecutter.json
index 0e9021aa..bbc09299 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -5,5 +5,6 @@
     "email": "Your email",
     "description": "A short description of the project.",
     "year": "2013",
-    "domain_name": "example.com"
+    "domain_name": "example.com",
+    "version": "0.1.0"
 }
diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py
new file mode 100644
index 00000000..0e507bb8
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/setup.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+
+import os
+import sys
+
+
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+import {{ cookiecutter.project_name }}
+version = {{ cookiecutter.repo_name }}.__version__
+
+setup(
+    name='{{ cookiecutter.project_name }}',
+    version=version,
+    author='{{ cookiecutter.full_name }}',
+    author_email='{{ cookiecutter.email }}',
+    packages=[
+        '{{ cookiecutter.project_name }}',
+    ],
+    include_package_data=True,
+    install_requires=[
+        'Django>=1.6.1',
+    ],
+    zip_safe=False,
+    scripts=['{{ cookiecutter.project_name }}/manage.py'],
+)
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py
new file mode 100644
index 00000000..704b5032
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/__init__.py
@@ -0,0 +1 @@
+__version__ = '{{ cookiecutter.version }}'
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/urls.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/urls.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/wsgi.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/wsgi.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/wsgi.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/wsgi.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py
similarity index 70%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py
index 384bd508..9f5bdbf0 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/manage.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/manage.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{cookiecutter.project_name}}.config.settings")
     os.environ.setdefault("DJANGO_CONFIGURATION", "Local")
 
     from configurations.management import execute_from_command_line
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/css/project.css
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/js/project.js
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/js/project.js
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/static/js/project.js
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/404.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/404.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/500.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/500.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/base.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/base.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/base.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email_confirm.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email_confirm.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email_confirmed.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/email_confirmed.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/login.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/login.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/logout.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/logout.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/logout.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_change.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_change.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_change.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_delete.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_delete.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_delete_done.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_delete_done.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_delete_done.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_done.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_done.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_from_key.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_from_key.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_from_key_done.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key_done.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_reset_from_key_done.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_set.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_set.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/password_set.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/signup.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/signup.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/signup_closed.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/signup_closed.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/signup_closed.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/verification_sent.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verification_sent.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/verification_sent.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/verified_email_required.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/verified_email_required.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/account/verified_email_required.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/add.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/add.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/avatar_tag.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/avatar_tag.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/base.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/base.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/change.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/change.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/confirm_delete.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/avatar/confirm_delete.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/base.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/base.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/pages/about.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/about.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/pages/about.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/pages/home.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/pages/home.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/pages/home.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_detail.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_detail.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_form.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_form.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_form.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_list.html
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/templates/users/user_list.html
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/admin.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/admin.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/admin.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/forms.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/forms.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/forms.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0001_initial.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0001_initial.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0001_initial.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0002_set_site_domain_and_name.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0002_set_site_domain_and_name.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/0002_set_site_domain_and_name.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/0002_set_site_domain_and_name.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/migrations/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/migrations/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/models.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/models.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/models.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/urls.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/urls.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/views.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/views.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/users/views.py