diff --git a/Manifest.in b/Manifest.in
new file mode 100644
index 0000000..1001e08
--- /dev/null
+++ b/Manifest.in
@@ -0,0 +1,3 @@
+include LICENSE
+include README.md
+
diff --git a/aircox/__init__.py b/aircox/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/templates/admin/base_site.html b/aircox/cms/templates/admin/base_site.html
similarity index 100%
rename from templates/admin/base_site.html
rename to aircox/cms/templates/admin/base_site.html
diff --git a/aircox/cms/templates/aircox/cms/tags b/aircox/cms/templates/aircox/cms/tags
deleted file mode 100644
index d01d39b..0000000
--- a/aircox/cms/templates/aircox/cms/tags
+++ /dev/null
@@ -1,6 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.8	//
diff --git a/setup.py b/setup.py
index 683f57b..be65c0d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,29 @@
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
-cwd = os.path.dirname(__file__)
-with open(os.path.join(cwd, 'README.md')) as readme:
-    README = readme.read()
+def to_rst (path):
+    try:
+        from pypandoc import convert
+        return convert(path, 'rst')
+    except ImportError:
+        print("pypandoc module not found, can not convert Markdown to RST")
+        return open(path, 'r').read()
 
-with open(os.path.join(cwd, 'requirements.txt')) as requirements:
-    REQUIREMENTS = requirements.read()
-    REQUIREMENTS = [r for r in REQUIREMENTS.split('\n') if r]
-
-os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+def to_array (path):
+    with open(path, 'r') as file:
+        return [r for r in file.read().split('\n') if r]
 
 setup(
     name='aircox',
     version='0.1',
     license='GPLv3',
     author='bkfox',
-    description='Aircox is a radio programs manager that includes tools and cms'
-    long_description=README,
+    description='Aircox is a radio programs manager that includes tools and cms',
+    long_description=to_rst('README.md'),
     url='http://bkfox.net/',
+    packages=find_packages(),
     include_package_data=True,
-    packages = ['aircox']
-    install_requires=REQUIREMENTS,
+    install_requires=to_array('requirements.txt'),
     classifiers=[
         'Framework :: Django',
         'Programming Language :: Python',