diff --git a/test.py b/examples/example.py
similarity index 100%
rename from test.py
rename to examples/example.py
diff --git a/__init__.py b/neohubapi/__init__.py
similarity index 100%
rename from __init__.py
rename to neohubapi/__init__.py
diff --git a/enums.py b/neohubapi/enums.py
similarity index 100%
rename from enums.py
rename to neohubapi/enums.py
diff --git a/neohub.py b/neohubapi/neohub.py
similarity index 100%
rename from neohub.py
rename to neohubapi/neohub.py
diff --git a/neostat.py b/neohubapi/neostat.py
similarity index 100%
rename from neostat.py
rename to neohubapi/neostat.py
diff --git a/setup.py b/setup.py
index ade8daf..1ad4ee5 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup(
         "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
         "Operating System :: OS Independent",
     ],
-    packages = ['neohubapi'],
+    packages=setuptools.find_packages(),
     install_requires = ['neohubapi'],
     keywords = ['neohub', 'heatmiser'],
 )