diff --git a/MANIFEST.in b/MANIFEST.in
index b555963..fe9e86e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-include README.md LICENSE templates
+include README.md LICENSE flask_migrate/templates/flask/*
 
diff --git a/flask_migrate.py b/flask_migrate/__init__.py
similarity index 100%
rename from flask_migrate.py
rename to flask_migrate/__init__.py
diff --git a/templates/flask/README b/flask_migrate/templates/flask/README
similarity index 100%
rename from templates/flask/README
rename to flask_migrate/templates/flask/README
diff --git a/templates/flask/alembic.ini.mako b/flask_migrate/templates/flask/alembic.ini.mako
similarity index 100%
rename from templates/flask/alembic.ini.mako
rename to flask_migrate/templates/flask/alembic.ini.mako
diff --git a/templates/flask/env.py b/flask_migrate/templates/flask/env.py
similarity index 100%
rename from templates/flask/env.py
rename to flask_migrate/templates/flask/env.py
diff --git a/templates/flask/script.py.mako b/flask_migrate/templates/flask/script.py.mako
similarity index 100%
rename from templates/flask/script.py.mako
rename to flask_migrate/templates/flask/script.py.mako
diff --git a/setup.py b/setup.py
index 0b8be80..4919390 100644
--- a/setup.py
+++ b/setup.py
@@ -9,16 +9,16 @@
 
 setup(
     name='Flask-Migrate',
-    version='0.1.0',
+    version='0.1.1',
     url='http://github.com/miguelgrinberg/flask-migrate/',
     license='MIT',
     author='Miguel Grinberg',
     author_email='miguelgrinberg50@gmail.com',
     description='SQLAlchemy database migrations for Flask applications using Alembic',
     long_description=__doc__,
-    py_modules=['flask_migrate'],
+    packages=['flask_migrate'],
     zip_safe=False,
-    data_files=[('templates/flask', ['templates/flask/alembic.ini.mako', 'templates/flask/env.py', 'templates/flask/README', 'templates/flask/script.py.mako'])],
+    data_files=[('flask_migrate/templates/flask', ['flask_migrate/templates/flask/alembic.ini.mako', 'flask_migrate/templates/flask/env.py', 'flask_migrate/templates/flask/README', 'flask_migrate/templates/flask/script.py.mako'])],
     include_package_data=True,
     platforms='any',
     install_requires=[