diff --git a/.gitignore b/.gitignore
index 18e1d02..dce8f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
 credentials
 openrc
 tests/__pycache__
-venafi_openstack_heat_plugin.egg-info/*
-
+openstack_heat_plugin_venafi.egg-info
+dist
diff --git a/Makefile b/Makefile
index 975a9b1..634022c 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,10 @@ e2e_show:
 	openstack stack output show $(STACK_NAME)  venafi_certificate
 	openstack stack output show $(STACK_NAME)  venafi_certificate -c output_value -f shell
 
-publish:
+package:
 	rm -rf dist/
+	rm -rf openstack_heat_plugin_venafi.egg-info
 	python3 setup.py sdist bdist_wheel
+
+upload:
 	twine upload dist/*
diff --git a/setup.py b/setup.py
index 24c56e7..21eeb64 100644
--- a/setup.py
+++ b/setup.py
@@ -17,17 +17,19 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 from setuptools import setup
-
+from setuptools import find_packages
 
 setup(
     name='openstack-heat-plugin-venafi',
     description='Venafi Inc. OpenStack Heat Plugin',
+    long_description='Venafi Inc. OpenStack Heat Plugin',
     license='Apache License, Version 2.0',
-    version=u"0.0.7",
+    version=u"0.0.10",
     author='Venafi Inc.',
     author_email='opensource@venafi.com',
     url='https://github.com/Venafi/openstack-heat-plugin-venafi',
     keywords=['venafi', 'openstack', 'heat', 'ssl', 'certificates'],
+    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=[
         'vcert >= 0.6.1'
     ],
diff --git a/venafi/__init__.py b/venafi-openstack-heat-plugin/__init__.py
similarity index 57%
rename from venafi/__init__.py
rename to venafi-openstack-heat-plugin/__init__.py
index 25607d4..b232c48 100644
--- a/venafi/__init__.py
+++ b/venafi-openstack-heat-plugin/__init__.py
@@ -1,2 +1,2 @@
-__version__ = u'0.0.7'
+__version__ = u'0.0.10'
 __openstackrelease__ = u'newton'
\ No newline at end of file
diff --git a/venafi/resources/__init__.py b/venafi-openstack-heat-plugin/resources/__init__.py
similarity index 100%
rename from venafi/resources/__init__.py
rename to venafi-openstack-heat-plugin/resources/__init__.py
diff --git a/venafi/resources/tests/__init__.py b/venafi-openstack-heat-plugin/resources/tests/__init__.py
similarity index 100%
rename from venafi/resources/tests/__init__.py
rename to venafi-openstack-heat-plugin/resources/tests/__init__.py
diff --git a/venafi/resources/tests/deploy_venafi_certificate_plugin.py b/venafi-openstack-heat-plugin/resources/tests/deploy_venafi_certificate_plugin.py
similarity index 100%
rename from venafi/resources/tests/deploy_venafi_certificate_plugin.py
rename to venafi-openstack-heat-plugin/resources/tests/deploy_venafi_certificate_plugin.py
diff --git a/venafi/resources/tests/fixtures/random_string.yml b/venafi-openstack-heat-plugin/resources/tests/fixtures/random_string.yml
similarity index 100%
rename from venafi/resources/tests/fixtures/random_string.yml
rename to venafi-openstack-heat-plugin/resources/tests/fixtures/random_string.yml
diff --git a/venafi/resources/tests/fixtures/test_certificate.yml b/venafi-openstack-heat-plugin/resources/tests/fixtures/test_certificate.yml
similarity index 100%
rename from venafi/resources/tests/fixtures/test_certificate.yml
rename to venafi-openstack-heat-plugin/resources/tests/fixtures/test_certificate.yml
diff --git a/venafi/resources/tests/fixtures/test_certificate_output_only.yml b/venafi-openstack-heat-plugin/resources/tests/fixtures/test_certificate_output_only.yml
similarity index 100%
rename from venafi/resources/tests/fixtures/test_certificate_output_only.yml
rename to venafi-openstack-heat-plugin/resources/tests/fixtures/test_certificate_output_only.yml
diff --git a/venafi/resources/tests/test_venafi_certificate.py b/venafi-openstack-heat-plugin/resources/tests/test_venafi_certificate.py
similarity index 100%
rename from venafi/resources/tests/test_venafi_certificate.py
rename to venafi-openstack-heat-plugin/resources/tests/test_venafi_certificate.py
diff --git a/venafi/resources/venafi_certificate.py b/venafi-openstack-heat-plugin/resources/venafi_certificate.py
similarity index 100%
rename from venafi/resources/venafi_certificate.py
rename to venafi-openstack-heat-plugin/resources/venafi_certificate.py