diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..15db3e49
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include Authors
+include Changelog
+include COPYING
+include GPL
+include PLAN.*
+include README
+include TESTING
+include ToDo
+include config/*
diff --git a/PLAN b/README
similarity index 100%
rename from PLAN
rename to README
diff --git a/tests/TESTING b/TESTING
similarity index 100%
rename from tests/TESTING
rename to TESTING
diff --git a/tests/comps.xml b/config/comps.xml
similarity index 100%
rename from tests/comps.xml
rename to config/comps.xml
diff --git a/tests/yum.conf.i386 b/config/yum.conf.i386
similarity index 100%
rename from tests/yum.conf.i386
rename to config/yum.conf.i386
diff --git a/tests/yum.conf.x86_64 b/config/yum.conf.x86_64
similarity index 88%
rename from tests/yum.conf.x86_64
rename to config/yum.conf.x86_64
index 41a39ed4..f84842eb 100644
--- a/tests/yum.conf.x86_64
+++ b/config/yum.conf.x86_64
@@ -19,7 +19,7 @@ metadata_expire=1800
 [development]
 name=Fedora Core - Development
 baseurl=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/development/x86_64/os/
-        http://download.fedora.redhat.com/pub/fedora/linux/core/development/x86_64/os/
+#        http://download.fedora.redhat.com/pub/fedora/linux/core/development/x86_64/os/
 #baseurl=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/development/$basearch/os/
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 enabled=1
diff --git a/__init__.py b/pungi
similarity index 96%
rename from __init__.py
rename to pungi
index e7d8fe18..e64e64e8 100755
--- a/__init__.py
+++ b/pungi
@@ -13,8 +13,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os
-import gather
-import pungi
+import pypungi.gather
+import pypungi.pungi
 import yum
 
 def main():
@@ -37,11 +37,11 @@ def main():
             print >> sys.stderr, "Error: Cannot create cache dir %s" % opts.cachedir
             sys.exit(1)
 
-    mygather = gather.Gather(opts, pkglist)
+    mygather = pypungi.gather.Gather(opts, pkglist)
     mygather.getPackageObjects()
     mygather.downloadPackages()
 
-    mypungi = pungi.Pungi(opts)
+    mypungi = pypungi.pungi.Pungi(opts)
     mypungi.doBuildinstall()
     mypungi.doPackageorder()
     mypungi.doSplittree()
diff --git a/pypungi/__init__.py b/pypungi/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/gather.py b/pypungi/gather.py
similarity index 100%
rename from gather.py
rename to pypungi/gather.py
diff --git a/pungi.py b/pypungi/pungi.py
similarity index 98%
rename from pungi.py
rename to pypungi/pungi.py
index d260dd5a..6cd3f950 100755
--- a/pungi.py
+++ b/pypungi/pungi.py
@@ -14,8 +14,7 @@
 
 import os
 import sys
-#sys.path.append('/usr/lib/anaconda-runtime')
-sys.path.append('./tests') # use our patched splittree for now
+#sys.path.append('/usr/lib/anaconda-runtime') # use our patched splittree for now
 import splittree
 import shutil
 
diff --git a/tests/splittree.py b/pypungi/splittree.py
similarity index 100%
rename from tests/splittree.py
rename to pypungi/splittree.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..a8891ac1
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,15 @@
+from distutils.core import setup
+import glob
+
+setup(name='pungi',
+      version='0.1.0',
+      description='Distribution compose tool',
+      author='Jesse Keating',
+      author_email='jkeating@redhat.com',
+      url='http://linux.duke.edu/projects/pungi',
+      license='GPL',
+      packages = ['pypungi'],
+      scripts = ['pungi'],
+      data_files=[('/etc/pungi', glob.glob('config/*'))]
+      )
+