diff --git a/setup.py b/setup.py
index 529cb7d7..2992e340 100644
--- a/setup.py
+++ b/setup.py
@@ -79,13 +79,13 @@ def readfile(filename):
     license="Apache 2.0",
     url=URL,
     packages=find_namespace_packages(
-        where="cloudmesh/",
+        where="cloudmesh",
         exclude=("tests",
                  "deprecated",
                  "propose",
                  "examples",
                  "conda"),
-        include=['cloudmesh']),
+        include=['cloudmesh.*']),
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",