diff --git a/MANIFEST.in b/MANIFEST.in
index cac48c6..553eaa6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-recursive-include src/templates *.html
+recursive-include django_app_template/templates *.html
diff --git a/src/django_app_template/__init__.py b/django_app_template/__init__.py
similarity index 100%
rename from src/django_app_template/__init__.py
rename to django_app_template/__init__.py
diff --git a/src/django_app_template/admin.py b/django_app_template/admin.py
similarity index 100%
rename from src/django_app_template/admin.py
rename to django_app_template/admin.py
diff --git a/src/django_app_template/models.py b/django_app_template/models.py
similarity index 100%
rename from src/django_app_template/models.py
rename to django_app_template/models.py
diff --git a/src/django_app_template/templates/app_template/message.html b/django_app_template/templates/app_template/message.html
similarity index 100%
rename from src/django_app_template/templates/app_template/message.html
rename to django_app_template/templates/app_template/message.html
diff --git a/src/django_app_template/templatetags/__init__.py b/django_app_template/templatetags/__init__.py
similarity index 100%
rename from src/django_app_template/templatetags/__init__.py
rename to django_app_template/templatetags/__init__.py
diff --git a/src/django_app_template/templatetags/app_tags.py b/django_app_template/templatetags/app_tags.py
similarity index 100%
rename from src/django_app_template/templatetags/app_tags.py
rename to django_app_template/templatetags/app_tags.py
diff --git a/src/django_app_template/tests.py b/django_app_template/tests.py
similarity index 100%
rename from src/django_app_template/tests.py
rename to django_app_template/tests.py
diff --git a/src/django_app_template/testsettings.py b/django_app_template/testsettings.py
similarity index 100%
rename from src/django_app_template/testsettings.py
rename to django_app_template/testsettings.py
diff --git a/src/django_app_template/urls.py b/django_app_template/urls.py
similarity index 100%
rename from src/django_app_template/urls.py
rename to django_app_template/urls.py
diff --git a/src/django_app_template/version.py b/django_app_template/version.py
similarity index 100%
rename from src/django_app_template/version.py
rename to django_app_template/version.py
diff --git a/src/django_app_template/views.py b/django_app_template/views.py
similarity index 100%
rename from src/django_app_template/views.py
rename to django_app_template/views.py
diff --git a/set_name.sh b/set_name.sh
index 267cd91..886f06d 100755
--- a/set_name.sh
+++ b/set_name.sh
@@ -5,8 +5,14 @@ LOWER_PROJECT=${PROJECT/-/_}
 
 find . \
     \( -not \( -path './parts/*' -or -path './bin/*' -or -path './develop-eggs/*' \) \) -and \
-    \( -name '*.py' -or -name '*.rst' -or -name Makefile -or -name *.cfg -or -name LICENSE -or -name .gitignore \) \
+    \( -name '*.py' -or -name '*.rst' -or -name Makefile -or -name *.cfg -or -name *.in -or -name LICENSE -or -name .gitignore \) \
     -print0 | \
     xargs -0 sed -i \
                 -e "s/django-app-template/${PROJECT}/g" \
                 -e "s/django_app_template/${LOWER_PROJECT}/g"
+
+if [ -e .git ]; then
+    git mv django_app_template ${LOWER_PROJECT}
+else
+    mv django_app_template ${LOWER_PROJECT}
+fi
diff --git a/setup.py b/setup.py
index b8afd98..fb1b6fc 100644
--- a/setup.py
+++ b/setup.py
@@ -25,8 +25,7 @@
         'Programming Language :: Python',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    package_dir = {'': 'src'},
-    packages = find_packages('src'),
+    packages = find_packages(),
     include_package_data = True,
     zip_safe = False,
 )