diff --git a/.gitmodules b/.gitmodules
index 2f940acaf..fbbc3e54f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,63 +1,63 @@
-[submodule "puppet/modules/glance"]
-	path = puppet/modules/glance
+[submodule "packstack/puppet/modules/glance"]
+	path = packstack/puppet/modules/glance
 	url = https://github.com/puppetlabs/puppetlabs-glance.git
-[submodule "puppet/modules/horizon"]
-	path = puppet/modules/horizon
+[submodule "packstack/puppet/modules/horizon"]
+	path = packstack/puppet/modules/horizon
 	url = https://github.com/puppetlabs/puppetlabs-horizon.git
-[submodule "puppet/modules/keystone"]
-	path = puppet/modules/keystone
+[submodule "packstack/puppet/modules/keystone"]
+	path = packstack/puppet/modules/keystone
 	url = https://github.com/puppetlabs/puppetlabs-keystone.git
-[submodule "puppet/modules/nova"]
-	path = puppet/modules/nova
+[submodule "packstack/puppet/modules/nova"]
+	path = packstack/puppet/modules/nova
 	url = https://github.com/puppetlabs/puppetlabs-nova.git
-[submodule "puppet/modules/openstack"]
-	path = puppet/modules/openstack
+[submodule "packstack/puppet/modules/openstack"]
+	path = packstack/puppet/modules/openstack
 	url = https://github.com/puppetlabs/puppetlabs-openstack.git
-[submodule "puppet/modules/swift"]
-	path = puppet/modules/swift
+[submodule "packstack/puppet/modules/swift"]
+	path = packstack/puppet/modules/swift
 	url = https://github.com/puppetlabs/puppetlabs-swift.git
-[submodule "puppet/modules/cinder"]
-	path = puppet/modules/cinder
+[submodule "packstack/puppet/modules/cinder"]
+	path = packstack/puppet/modules/cinder
 	url = https://github.com/puppetlabs/puppetlabs-cinder.git
-[submodule "puppet/modules/stdlib"]
-	path = puppet/modules/stdlib
+[submodule "packstack/puppet/modules/stdlib"]
+	path = packstack/puppet/modules/stdlib
 	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
-[submodule "puppet/modules/sysctl"]
-	path = puppet/modules/sysctl
+[submodule "packstack/puppet/modules/sysctl"]
+	path = packstack/puppet/modules/sysctl
 	url = https://github.com/puppetlabs/puppetlabs-sysctl.git
-[submodule "puppet/modules/mysql"]
-	path = puppet/modules/mysql
+[submodule "packstack/puppet/modules/mysql"]
+	path = packstack/puppet/modules/mysql
 	url = https://github.com/puppetlabs/puppetlabs-mysql.git
-[submodule "puppet/modules/concat"]
-	path = puppet/modules/concat
+[submodule "packstack/puppet/modules/concat"]
+	path = packstack/puppet/modules/concat
 	url = https://github.com/puppetlabs/puppetlabs-concat.git
-[submodule "puppet/modules/create_resources"]
-	path = puppet/modules/create_resources
+[submodule "packstack/puppet/modules/create_resources"]
+	path = packstack/puppet/modules/create_resources
 	url = https://github.com/puppetlabs/puppetlabs-create_resources.git
-[submodule "puppet/modules/rsync"]
-	path = puppet/modules/rsync
+[submodule "packstack/puppet/modules/rsync"]
+	path = packstack/puppet/modules/rsync
 	url = https://github.com/puppetlabs/puppetlabs-rsync.git
-[submodule "puppet/modules/xinetd"]
-	path = puppet/modules/xinetd
+[submodule "packstack/puppet/modules/xinetd"]
+	path = packstack/puppet/modules/xinetd
 	url = https://github.com/puppetlabs/puppetlabs-xinetd.git
-[submodule "puppet/modules/apache"]
-	path = puppet/modules/apache
+[submodule "packstack/puppet/modules/apache"]
+	path = packstack/puppet/modules/apache
 	url = https://github.com/puppetlabs/puppetlabs-apache.git
-[submodule "puppet/modules/firewall"]
-	path = puppet/modules/firewall
+[submodule "packstack/puppet/modules/firewall"]
+	path = packstack/puppet/modules/firewall
 	url = https://github.com/lstanden/puppetlabs-firewall.git
-[submodule "puppet/modules/memcached"]
-	path = puppet/modules/memcached
+[submodule "packstack/puppet/modules/memcached"]
+	path = packstack/puppet/modules/memcached
 	url = https://github.com/saz/puppet-memcached.git
-[submodule "puppet/modules/ssh"]
-	path = puppet/modules/ssh
+[submodule "packstack/puppet/modules/ssh"]
+	path = packstack/puppet/modules/ssh
 	url = https://github.com/saz/puppet-ssh.git
-[submodule "puppet/modules/inifile"]
-	path = puppet/modules/inifile
+[submodule "packstack/puppet/modules/inifile"]
+	path = packstack/puppet/modules/inifile
 	url = https://github.com/cprice-puppet/puppetlabs-inifile.git
-[submodule "puppet/modules/qpid"]
-	path = puppet/modules/qpid
+[submodule "packstack/puppet/modules/qpid"]
+	path = packstack/puppet/modules/qpid
 	url = https://github.com/derekhiggins/puppet-qpid.git
-[submodule "puppet/modules/vlan"]
-	path = puppet/modules/vlan
+[submodule "packstack/puppet/modules/vlan"]
+	path = packstack/puppet/modules/vlan
 	url = https://github.com/derekhiggins/puppet-vlan.git
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..2bc784db5
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include docs/*
+recursive-include packstack/puppet *
+recursive-include packstack/templates *
+prune packstack/puppet/modules/*/.git
+
diff --git a/README b/README
index a9521a3f6..b2b0b6b2b 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ $ git clone --recursive git://github.com/fedora-openstack/packstack.git
 $ cd packstack
 
 Option 1 (using answer file)
-$ ./packstack --gen-answer-file=ans.txt
+$ ./bin/packstack --gen-answer-file=ans.txt
 
 # then edit answers.txt as appropriate e.g.
 o set CONFIG_SSH_KEY to a public ssh key to be installed to remote machines
@@ -21,10 +21,10 @@ o Edit 127.0.0.1 to anywhere you want to install a piece of openstack on another
 o Edit the 3 network interfaces to whatever makes sense in your setup
 o If your testing on a vm then set CONFIG_LIBVIRT_TYPE=qemu
 
-$ ./packstack --answer-file=ans.txt
+$ ./bin/packstack --answer-file=ans.txt
 
 Option 2 (prompts for configuration options)
-$ ./packstack
+$ ./bin/packstack
 
 thats it, if everything went well you can now start using openstack
 $ cd
diff --git a/bin/packstack b/bin/packstack
new file mode 100755
index 000000000..af1f421d2
--- /dev/null
+++ b/bin/packstack
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import os, sys
+
+try:
+    import packstack
+except:
+    # packstack isn't installed, running from source checkout
+    sys.path.append(os.path.join(os.path.split(sys.argv[0])[0], ".."))
+    import packstack
+
+os.environ["INSTALLER_PROJECT_DIR"] = os.path.abspath(os.path.split(packstack.__file__)[0])
+
+from packstack.installer import run_setup
+run_setup.main()
diff --git a/bin/release.sh b/bin/release.sh
new file mode 100755
index 000000000..6caf33c3a
--- /dev/null
+++ b/bin/release.sh
@@ -0,0 +1,12 @@
+
+# 
+if [ "$1" = "release" ] ; then
+    sed -i -e 's/FINAL=False/FINAL=True/g' packstack/version.py
+    SNAPTAG=""
+else
+    SNAPTAG=$(git log --oneline | wc -l)
+fi
+
+python setup.py setopt -o tag_build -s "$SNAPTAG" -c egg_info
+python setup.py sdist
+git checkout packstack/version.py
diff --git a/packstack b/packstack
deleted file mode 100755
index c5bc6aa27..000000000
--- a/packstack
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export INSTALLER_PROJECT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-python $INSTALLER_PROJECT_DIR/installer/run_setup.py $@
-
-
diff --git a/packstack/__init__.py b/packstack/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/installer/.gitignore b/packstack/installer/.gitignore
similarity index 100%
rename from installer/.gitignore
rename to packstack/installer/.gitignore
diff --git a/installer/LICENSE b/packstack/installer/LICENSE
similarity index 100%
rename from installer/LICENSE
rename to packstack/installer/LICENSE
diff --git a/packstack/installer/__init__.py b/packstack/installer/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/installer/basedefs.py b/packstack/installer/basedefs.py
similarity index 100%
rename from installer/basedefs.py
rename to packstack/installer/basedefs.py
diff --git a/installer/common_utils.py b/packstack/installer/common_utils.py
similarity index 99%
rename from installer/common_utils.py
rename to packstack/installer/common_utils.py
index 364bae030..c555e4cf4 100644
--- a/installer/common_utils.py
+++ b/packstack/installer/common_utils.py
@@ -11,9 +11,7 @@ import traceback
 import os
 import basedefs
 import datetime
-import libxml2
 import types
-import shutil
 import time
 import tempfile
 
diff --git a/installer/engine_validators.py b/packstack/installer/engine_validators.py
similarity index 100%
rename from installer/engine_validators.py
rename to packstack/installer/engine_validators.py
diff --git a/installer/output_messages.py b/packstack/installer/output_messages.py
similarity index 100%
rename from installer/output_messages.py
rename to packstack/installer/output_messages.py
diff --git a/installer/run_setup.py b/packstack/installer/run_setup.py
similarity index 99%
rename from installer/run_setup.py
rename to packstack/installer/run_setup.py
index 2f49f1084..093736c03 100755
--- a/installer/run_setup.py
+++ b/packstack/installer/run_setup.py
@@ -548,7 +548,7 @@ def _summaryParamsToLog():
 def runSequences():
     controller.runAllSequences()
 
-def main(configFile=None):
+def _main(configFile=None):
     try:
         logging.debug("Entered main(configFile='%s')"%(configFile))
         print output_messages.INFO_HEADER
@@ -669,7 +669,9 @@ def loadPlugins():
     """
     sys.path.append(basedefs.DIR_PLUGINS)
     sys.path.append(basedefs.DIR_MODULES)
-    fileList = sorted(os.listdir(basedefs.DIR_PLUGINS), cmp=plugin_compare)
+    
+    fileList = [f for f in os.listdir(basedefs.DIR_PLUGINS) if f[0] != "_"]
+    fileList = sorted(fileList, cmp=plugin_compare)
     for item in fileList:
         # Looking for files that end with ###.py, example: a_plugin_100.py
         match = re.search("^(.+\_\d\d\d)\.py$", item)
@@ -740,7 +742,7 @@ def initMain():
     initPluginsConfig()
 
 
-if __name__ == "__main__":
+def main():
     try:
         initMain()
 
@@ -778,7 +780,7 @@ if __name__ == "__main__":
                         if len(param) > 0 and value:
                             commandLineValues[param[0].getKey("CONF_NAME")] = value
 
-            main(confFile)
+            _main(confFile)
 
     except SystemExit:
         raise
@@ -789,3 +791,5 @@ if __name__ == "__main__":
         print output_messages.ERR_CHECK_LOG_FILE_FOR_MORE_INFO%(logFile)
         sys.exit(1)
 
+if __name__ == "__main__":
+    main()
diff --git a/installer/sample-project/plugins/createfile_101.py b/packstack/installer/sample-project/plugins/createfile_101.py
similarity index 100%
rename from installer/sample-project/plugins/createfile_101.py
rename to packstack/installer/sample-project/plugins/createfile_101.py
diff --git a/installer/setup_controller.py b/packstack/installer/setup_controller.py
similarity index 100%
rename from installer/setup_controller.py
rename to packstack/installer/setup_controller.py
diff --git a/installer/setup_params.py b/packstack/installer/setup_params.py
similarity index 100%
rename from installer/setup_params.py
rename to packstack/installer/setup_params.py
diff --git a/installer/setup_sequences.py b/packstack/installer/setup_sequences.py
similarity index 100%
rename from installer/setup_sequences.py
rename to packstack/installer/setup_sequences.py
diff --git a/packstack/modules/__init__.py b/packstack/modules/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/ospluginutils.py b/packstack/modules/ospluginutils.py
similarity index 94%
rename from modules/ospluginutils.py
rename to packstack/modules/ospluginutils.py
index 66eca14ab..35bc744d6 100644
--- a/modules/ospluginutils.py
+++ b/packstack/modules/ospluginutils.py
@@ -1,8 +1,8 @@
 
 import os
 
-import basedefs
-from setup_controller import Controller
+from packstack.installer import basedefs
+from packstack.installer.setup_controller import Controller
 
 controller = Controller()
 
diff --git a/packstack/plugins/__init__.py b/packstack/plugins/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/cinder_250.py b/packstack/plugins/cinder_250.py
similarity index 91%
rename from plugins/cinder_250.py
rename to packstack/plugins/cinder_250.py
index 6f8b7b70e..5deeb709b 100644
--- a/plugins/cinder_250.py
+++ b/packstack/plugins/cinder_250.py
@@ -6,11 +6,11 @@ import logging
 import os
 import uuid
 
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
-from ospluginutils import getManifestTemplate, appendManifestFile
+from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py
similarity index 92%
rename from plugins/dashboard_500.py
rename to packstack/plugins/dashboard_500.py
index 6bf220669..80a331386 100644
--- a/plugins/dashboard_500.py
+++ b/packstack/plugins/dashboard_500.py
@@ -6,10 +6,11 @@ import logging
 import os
 import uuid
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
-from ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
+
+from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/glance_200.py b/packstack/plugins/glance_200.py
similarity index 91%
rename from plugins/glance_200.py
rename to packstack/plugins/glance_200.py
index ccdfc9086..e288b27a1 100644
--- a/plugins/glance_200.py
+++ b/packstack/plugins/glance_200.py
@@ -7,10 +7,11 @@ import os
 import uuid
 
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
-from ospluginutils import getManifestTemplate, appendManifestFile
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
+
+from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/global_000.py b/packstack/plugins/global_000.py
similarity index 97%
rename from plugins/global_000.py
rename to packstack/plugins/global_000.py
index 92726301d..f6fdcf7a5 100644
--- a/plugins/global_000.py
+++ b/packstack/plugins/global_000.py
@@ -4,8 +4,8 @@ Plugin responsible for setting Openstack global options
 
 import logging
 
-import engine_validators as validate
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+import packstack.installer.common_utils as utils
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
similarity index 96%
rename from plugins/keystone_100.py
rename to packstack/plugins/keystone_100.py
index 7bc474a69..35db6d43b 100644
--- a/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -7,9 +7,9 @@ import os
 import uuid
 
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/mysql_001.py b/packstack/plugins/mysql_001.py
similarity index 94%
rename from plugins/mysql_001.py
rename to packstack/plugins/mysql_001.py
index 4bb5f63f1..05113ca0e 100644
--- a/plugins/mysql_001.py
+++ b/packstack/plugins/mysql_001.py
@@ -5,9 +5,11 @@ Installs and configures MySQL
 import logging
 import os
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
+
+from packstack.modules.ospluginutils import gethostlist
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/nova_300.py b/packstack/plugins/nova_300.py
similarity index 98%
rename from plugins/nova_300.py
rename to packstack/plugins/nova_300.py
index 2a53272c8..d3f705777 100644
--- a/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -5,9 +5,11 @@ Installs and configures nova
 import logging
 import os
 
-import engine_validators as validate
-import common_utils as utils
-from ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
+
+from packstack.modules.ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py
similarity index 95%
rename from plugins/openstack_client_400.py
rename to packstack/plugins/openstack_client_400.py
index aef065b9c..dfe3e7039 100644
--- a/plugins/openstack_client_400.py
+++ b/packstack/plugins/openstack_client_400.py
@@ -7,9 +7,9 @@ import os
 import uuid
 
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/puppet_950.py b/packstack/plugins/puppet_950.py
similarity index 96%
rename from plugins/puppet_950.py
rename to packstack/plugins/puppet_950.py
index 0d44c7632..5c894d20f 100644
--- a/plugins/puppet_950.py
+++ b/packstack/plugins/puppet_950.py
@@ -5,12 +5,11 @@ import logging
 import os
 import uuid
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
-
-from ospluginutils import gethostlist
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
+from packstack.modules.ospluginutils import gethostlist
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/qpid_002.py b/packstack/plugins/qpid_002.py
similarity index 94%
rename from plugins/qpid_002.py
rename to packstack/plugins/qpid_002.py
index f12741945..626371e55 100644
--- a/plugins/qpid_002.py
+++ b/packstack/plugins/qpid_002.py
@@ -6,10 +6,9 @@ import logging
 import os
 import uuid
 
-
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py
similarity index 92%
rename from plugins/serverprep_901.py
rename to packstack/plugins/serverprep_901.py
index 1650bedc1..aff61b543 100644
--- a/plugins/serverprep_901.py
+++ b/packstack/plugins/serverprep_901.py
@@ -6,11 +6,11 @@ import glob
 import logging
 import os
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
-from ospluginutils import gethostlist
+from packstack.modules.ospluginutils import gethostlist
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/sshkeys_000.py b/packstack/plugins/sshkeys_000.py
similarity index 93%
rename from plugins/sshkeys_000.py
rename to packstack/plugins/sshkeys_000.py
index 314bab178..0ae7bd65f 100644
--- a/plugins/sshkeys_000.py
+++ b/packstack/plugins/sshkeys_000.py
@@ -6,11 +6,11 @@ import glob
 import logging
 import os
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
 
-from ospluginutils import gethostlist
+from packstack.modules.ospluginutils import gethostlist
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/plugins/swift_600.py b/packstack/plugins/swift_600.py
similarity index 97%
rename from plugins/swift_600.py
rename to packstack/plugins/swift_600.py
index bdea14d05..f207ea993 100644
--- a/plugins/swift_600.py
+++ b/packstack/plugins/swift_600.py
@@ -6,10 +6,11 @@ import logging
 import os
 import uuid
 
-import engine_validators as validate
-import basedefs
-import common_utils as utils
-from ospluginutils import NovaConfig, getManifestTemplate, appendManifestFile
+import packstack.installer.engine_validators as validate
+from packstack.installer import basedefs
+import packstack.installer.common_utils as utils
+
+from packstack.modules.ospluginutils import getManifestTemplate, appendManifestFile
 
 # Controller object will be initialized from main flow
 controller = None
diff --git a/puppet/modules/apache b/packstack/puppet/modules/apache
similarity index 100%
rename from puppet/modules/apache
rename to packstack/puppet/modules/apache
diff --git a/puppet/modules/cinder b/packstack/puppet/modules/cinder
similarity index 100%
rename from puppet/modules/cinder
rename to packstack/puppet/modules/cinder
diff --git a/puppet/modules/concat b/packstack/puppet/modules/concat
similarity index 100%
rename from puppet/modules/concat
rename to packstack/puppet/modules/concat
diff --git a/puppet/modules/create_resources b/packstack/puppet/modules/create_resources
similarity index 100%
rename from puppet/modules/create_resources
rename to packstack/puppet/modules/create_resources
diff --git a/puppet/modules/firewall b/packstack/puppet/modules/firewall
similarity index 100%
rename from puppet/modules/firewall
rename to packstack/puppet/modules/firewall
diff --git a/puppet/modules/glance b/packstack/puppet/modules/glance
similarity index 100%
rename from puppet/modules/glance
rename to packstack/puppet/modules/glance
diff --git a/puppet/modules/horizon b/packstack/puppet/modules/horizon
similarity index 100%
rename from puppet/modules/horizon
rename to packstack/puppet/modules/horizon
diff --git a/puppet/modules/inifile b/packstack/puppet/modules/inifile
similarity index 100%
rename from puppet/modules/inifile
rename to packstack/puppet/modules/inifile
diff --git a/puppet/modules/keystone b/packstack/puppet/modules/keystone
similarity index 100%
rename from puppet/modules/keystone
rename to packstack/puppet/modules/keystone
diff --git a/puppet/modules/memcached b/packstack/puppet/modules/memcached
similarity index 100%
rename from puppet/modules/memcached
rename to packstack/puppet/modules/memcached
diff --git a/puppet/modules/mysql b/packstack/puppet/modules/mysql
similarity index 100%
rename from puppet/modules/mysql
rename to packstack/puppet/modules/mysql
diff --git a/puppet/modules/nova b/packstack/puppet/modules/nova
similarity index 100%
rename from puppet/modules/nova
rename to packstack/puppet/modules/nova
diff --git a/puppet/modules/openstack b/packstack/puppet/modules/openstack
similarity index 100%
rename from puppet/modules/openstack
rename to packstack/puppet/modules/openstack
diff --git a/puppet/modules/qpid b/packstack/puppet/modules/qpid
similarity index 100%
rename from puppet/modules/qpid
rename to packstack/puppet/modules/qpid
diff --git a/puppet/modules/rsync b/packstack/puppet/modules/rsync
similarity index 100%
rename from puppet/modules/rsync
rename to packstack/puppet/modules/rsync
diff --git a/packstack/puppet/modules/ssh b/packstack/puppet/modules/ssh
new file mode 160000
index 000000000..d6571f8c4
--- /dev/null
+++ b/packstack/puppet/modules/ssh
@@ -0,0 +1 @@
+Subproject commit d6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4
diff --git a/puppet/modules/stdlib b/packstack/puppet/modules/stdlib
similarity index 100%
rename from puppet/modules/stdlib
rename to packstack/puppet/modules/stdlib
diff --git a/puppet/modules/swift b/packstack/puppet/modules/swift
similarity index 100%
rename from puppet/modules/swift
rename to packstack/puppet/modules/swift
diff --git a/puppet/modules/sysctl b/packstack/puppet/modules/sysctl
similarity index 100%
rename from puppet/modules/sysctl
rename to packstack/puppet/modules/sysctl
diff --git a/puppet/modules/vlan b/packstack/puppet/modules/vlan
similarity index 100%
rename from puppet/modules/vlan
rename to packstack/puppet/modules/vlan
diff --git a/puppet/modules/xinetd b/packstack/puppet/modules/xinetd
similarity index 100%
rename from puppet/modules/xinetd
rename to packstack/puppet/modules/xinetd
diff --git a/puppet/templates/cinder.pp b/packstack/puppet/templates/cinder.pp
similarity index 100%
rename from puppet/templates/cinder.pp
rename to packstack/puppet/templates/cinder.pp
diff --git a/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp
similarity index 100%
rename from puppet/templates/glance.pp
rename to packstack/puppet/templates/glance.pp
diff --git a/puppet/templates/horizon.pp b/packstack/puppet/templates/horizon.pp
similarity index 100%
rename from puppet/templates/horizon.pp
rename to packstack/puppet/templates/horizon.pp
diff --git a/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
similarity index 100%
rename from puppet/templates/keystone.pp
rename to packstack/puppet/templates/keystone.pp
diff --git a/puppet/templates/keystone_cinder.pp b/packstack/puppet/templates/keystone_cinder.pp
similarity index 100%
rename from puppet/templates/keystone_cinder.pp
rename to packstack/puppet/templates/keystone_cinder.pp
diff --git a/puppet/templates/keystone_glance.pp b/packstack/puppet/templates/keystone_glance.pp
similarity index 100%
rename from puppet/templates/keystone_glance.pp
rename to packstack/puppet/templates/keystone_glance.pp
diff --git a/puppet/templates/keystone_nova.pp b/packstack/puppet/templates/keystone_nova.pp
similarity index 100%
rename from puppet/templates/keystone_nova.pp
rename to packstack/puppet/templates/keystone_nova.pp
diff --git a/puppet/templates/keystone_swift.pp b/packstack/puppet/templates/keystone_swift.pp
similarity index 100%
rename from puppet/templates/keystone_swift.pp
rename to packstack/puppet/templates/keystone_swift.pp
diff --git a/puppet/templates/mysql.pp b/packstack/puppet/templates/mysql.pp
similarity index 100%
rename from puppet/templates/mysql.pp
rename to packstack/puppet/templates/mysql.pp
diff --git a/puppet/templates/nova_api.pp b/packstack/puppet/templates/nova_api.pp
similarity index 100%
rename from puppet/templates/nova_api.pp
rename to packstack/puppet/templates/nova_api.pp
diff --git a/puppet/templates/nova_cert.pp b/packstack/puppet/templates/nova_cert.pp
similarity index 100%
rename from puppet/templates/nova_cert.pp
rename to packstack/puppet/templates/nova_cert.pp
diff --git a/puppet/templates/nova_common.pp b/packstack/puppet/templates/nova_common.pp
similarity index 100%
rename from puppet/templates/nova_common.pp
rename to packstack/puppet/templates/nova_common.pp
diff --git a/puppet/templates/nova_compute.pp b/packstack/puppet/templates/nova_compute.pp
similarity index 100%
rename from puppet/templates/nova_compute.pp
rename to packstack/puppet/templates/nova_compute.pp
diff --git a/puppet/templates/nova_network.pp b/packstack/puppet/templates/nova_network.pp
similarity index 100%
rename from puppet/templates/nova_network.pp
rename to packstack/puppet/templates/nova_network.pp
diff --git a/puppet/templates/nova_sched.pp b/packstack/puppet/templates/nova_sched.pp
similarity index 100%
rename from puppet/templates/nova_sched.pp
rename to packstack/puppet/templates/nova_sched.pp
diff --git a/puppet/templates/openstack_client.pp b/packstack/puppet/templates/openstack_client.pp
similarity index 100%
rename from puppet/templates/openstack_client.pp
rename to packstack/puppet/templates/openstack_client.pp
diff --git a/puppet/templates/qpid.pp b/packstack/puppet/templates/qpid.pp
similarity index 100%
rename from puppet/templates/qpid.pp
rename to packstack/puppet/templates/qpid.pp
diff --git a/puppet/templates/swift_builder.pp b/packstack/puppet/templates/swift_builder.pp
similarity index 100%
rename from puppet/templates/swift_builder.pp
rename to packstack/puppet/templates/swift_builder.pp
diff --git a/puppet/templates/swift_common.pp b/packstack/puppet/templates/swift_common.pp
similarity index 100%
rename from puppet/templates/swift_common.pp
rename to packstack/puppet/templates/swift_common.pp
diff --git a/puppet/templates/swift_loopback.pp b/packstack/puppet/templates/swift_loopback.pp
similarity index 100%
rename from puppet/templates/swift_loopback.pp
rename to packstack/puppet/templates/swift_loopback.pp
diff --git a/puppet/templates/swift_proxy.pp b/packstack/puppet/templates/swift_proxy.pp
similarity index 100%
rename from puppet/templates/swift_proxy.pp
rename to packstack/puppet/templates/swift_proxy.pp
diff --git a/puppet/templates/swift_storage.pp b/packstack/puppet/templates/swift_storage.pp
similarity index 100%
rename from puppet/templates/swift_storage.pp
rename to packstack/puppet/templates/swift_storage.pp
diff --git a/packstack/version.py b/packstack/version.py
new file mode 100644
index 000000000..bd4a6162c
--- /dev/null
+++ b/packstack/version.py
@@ -0,0 +1,11 @@
+
+VERSION = ['2013', '2', '1']
+FINAL=False
+
+def version_string():
+    if FINAL:
+        return '.'.join(filter(None, VERSION))
+    else:
+        return '.'.join(filter(None, VERSION))+"dev"
+        
+
diff --git a/puppet/modules/ssh b/puppet/modules/ssh
deleted file mode 160000
index c6fe1c360..000000000
--- a/puppet/modules/ssh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6fe1c360374c8fc5b664091a828d9dab0a6a515
diff --git a/setup.py b/setup.py
new file mode 100644
index 000000000..1c026183a
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+import os
+from setuptools import setup, find_packages
+
+from packstack import version
+
+# Utility function to read the README file.
+# Used for the long_description.  It's nice, because now 1) we have a top level
+# README file and 2) it's easier to type in the README file than to put a raw
+# string in below ...
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+setup(
+    name = "packstack",
+    version = version.version_string(),
+    author = "Derek Higgins",
+    author_email = "derekh@redhat.com",
+    description = ("A utility to install openstack"),
+    license = "ASL 2.0",
+    keywords = "openstack",
+    url = "https://github.com/fedora-openstack/packstack",
+    packages=find_packages('.'),
+    include_package_data=True,
+    long_description=read('README'),
+    zip_safe=False,
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Topic :: Utilities",
+        "License :: OSI Approved :: Apache Software License",
+    ],
+    scripts=["bin/packstack"]
+)
+