diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3b435ee38..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,96 +0,0 @@
-[submodule "packstack/puppet/modules/glance"]
-	path = packstack/puppet/modules/glance
-	url = https://github.com/stackforge/puppet-glance.git
-[submodule "packstack/puppet/modules/horizon"]
-	path = packstack/puppet/modules/horizon
-	url = https://github.com/stackforge/puppet-horizon.git
-[submodule "packstack/puppet/modules/keystone"]
-	path = packstack/puppet/modules/keystone
-	url = https://github.com/packstack/puppet-keystone.git
-[submodule "packstack/puppet/modules/nova"]
-	path = packstack/puppet/modules/nova
-	url = https://github.com/stackforge/puppet-nova.git
-[submodule "packstack/puppet/modules/openstack"]
-	path = packstack/puppet/modules/openstack
-	url = https://github.com/stackforge/puppet-openstack.git
-[submodule "packstack/puppet/modules/swift"]
-	path = packstack/puppet/modules/swift
-	url = https://github.com/stackforge/puppet-swift.git
-[submodule "packstack/puppet/modules/cinder"]
-	path = packstack/puppet/modules/cinder
-	url = https://github.com/stackforge/puppet-cinder.git
-[submodule "packstack/puppet/modules/stdlib"]
-	path = packstack/puppet/modules/stdlib
-	url = https://github.com/puppetlabs/puppetlabs-stdlib.git
-[submodule "packstack/puppet/modules/sysctl"]
-	path = packstack/puppet/modules/sysctl
-	url = https://github.com/puppetlabs/puppetlabs-sysctl.git
-[submodule "packstack/puppet/modules/mysql"]
-	path = packstack/puppet/modules/mysql
-	url = https://github.com/packstack/puppetlabs-mysql.git
-[submodule "packstack/puppet/modules/concat"]
-	path = packstack/puppet/modules/concat
-	url = https://github.com/ripienaar/puppet-concat.git
-[submodule "packstack/puppet/modules/rsync"]
-	path = packstack/puppet/modules/rsync
-	url = https://github.com/puppetlabs/puppetlabs-rsync.git
-[submodule "packstack/puppet/modules/xinetd"]
-	path = packstack/puppet/modules/xinetd
-	url = https://github.com/packstack/puppetlabs-xinetd.git
-[submodule "packstack/puppet/modules/apache"]
-	path = packstack/puppet/modules/apache
-	url = https://github.com/puppetlabs/puppetlabs-apache.git
-[submodule "packstack/puppet/modules/firewall"]
-	path = packstack/puppet/modules/firewall
-	url = https://github.com/puppetlabs/puppetlabs-firewall.git
-[submodule "packstack/puppet/modules/memcached"]
-	path = packstack/puppet/modules/memcached
-	url = https://github.com/saz/puppet-memcached.git
-[submodule "packstack/puppet/modules/ssh"]
-	path = packstack/puppet/modules/ssh
-	url = https://github.com/saz/puppet-ssh.git
-[submodule "packstack/puppet/modules/inifile"]
-	path = packstack/puppet/modules/inifile
-        url = https://github.com/puppetlabs/puppetlabs-inifile.git
-[submodule "packstack/puppet/modules/qpid"]
-	path = packstack/puppet/modules/qpid
-	url = https://github.com/dprince/puppet-qpid
-[submodule "packstack/puppet/modules/vlan"]
-	path = packstack/puppet/modules/vlan
-	url = https://github.com/derekhiggins/puppet-vlan.git
-[submodule "packstack/puppet/modules/vswitch"]
-	path = packstack/puppet/modules/vswitch
-	url = https://github.com/stackforge/puppet-vswitch.git
-[submodule "packstack/puppet/modules/tempest"]
-	path = packstack/puppet/modules/tempest
-	url = git://github.com/stackforge/puppet-tempest.git
-[submodule "packstack/puppet/modules/vcsrepo"]
-	path = packstack/puppet/modules/vcsrepo
-	url = https://github.com/puppetlabs/puppetlabs-vcsrepo.git
-[submodule "packstack/puppet/modules/neutron"]
-	path = packstack/puppet/modules/neutron
-	url = https://github.com/stackforge/puppet-neutron.git
-[submodule "packstack/puppet/modules/haproxy"]
-	path = packstack/puppet/modules/haproxy
-	url = https://github.com/puppetlabs/puppetlabs-haproxy.git
-[submodule "packstack/puppet/modules/ceilometer"]
-	path = packstack/puppet/modules/ceilometer
-	url = https://github.com/stackforge/puppet-ceilometer.git
-[submodule "packstack/puppet/modules/mongodb"]
-	path = packstack/puppet/modules/mongodb
-	url = https://github.com/puppetlabs/puppetlabs-mongodb.git
-[submodule "packstack/puppet/modules/heat"]
-	path = packstack/puppet/modules/heat
-	url = https://github.com/packstack/puppet-heat.git
-[submodule "packstack/puppet/modules/pacemaker"]
-	path = packstack/puppet/modules/pacemaker
-	url = https://github.com/radez/puppet-pacemaker.git
-[submodule "packstack/puppet/modules/certmonger"]
-	path = packstack/puppet/modules/certmonger
-	url = git://github.com/rcritten/puppet-certmonger.git
-[submodule "packstack/puppet/modules/nssdb"]
-	path = packstack/puppet/modules/nssdb
-	url = https://github.com/rcritten/puppet-nssdb.git
-[submodule "packstack/puppet/modules/gluster"]
-	path = packstack/puppet/modules/gluster
-	url = https://github.com/redhat-openstack/puppet-openstack-storage.git
diff --git a/README b/README
index 51a76182a..5b6731ebe 100644
--- a/README
+++ b/README
@@ -7,14 +7,16 @@ group of hosts (over ssh)
 This utility is still in the early stages, a lot of the configuration
 options have yet to be added
 
-Installation
+Installation of packstack:
 $ yum install -y git
-$ git clone --recursive git://github.com/stackforge/packstack.git
-$ cd packstack
-$ python setup.py install_puppet_modules
+$ git clone git://github.com/stackforge/packstack.git
+$ cd packstack && sudo python setup.py install
+
+Installation of openstack-puppet-modules (REQUIRED if running packstack from source):
+$ sudo python setup.py install_puppet_modules
 
 Option 1 (using answer file)
-$ ./bin/packstack --gen-answer-file=ans.txt
+$ packstack --gen-answer-file=ans.txt
 
 # then edit ans.txt as appropriate e.g.
 o set CONFIG_SSH_KEY to a public ssh key to be installed to remote machines
@@ -25,10 +27,10 @@ you'll need to use a icehouse repository for example for RHEL
 CONFIG_REPO=http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/epel-6/
 
 
-$ ./bin/packstack --answer-file=ans.txt
+$ packstack --answer-file=ans.txt
 
 Option 2 (prompts for configuration options)
-$ ./bin/packstack
+$ packstack
 
 that's it, if everything went well you can now start using openstack
 $ cd