diff --git a/setup.cfg b/setup.cfg
index e22c6b4..b316cac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ ignore=E226,N802,N803,N806,E402
 [versioneer]
 VCS = git
 style = pep440
-versionfile_source = venv_tools/_version.py
+versionfile_source = src/venv_tools/_version.py
 versionfile_build = venv_tools/_version.py
 tag_prefix = v
 #parentdir_prefix =
diff --git a/setup.py b/setup.py
index 52ddf8d..f4ecc35 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,8 @@
 setuptools.setup(
     name="venv_tools",
     version = versioneer.get_version(),
-    packages = setuptools.find_packages(),
+    packages = setuptools.find_packages('src'),
+    package_dir = {'': 'src'},
     install_requires = ["virtualenv"],
     author = "James Tocknell",
     author_email = "aragilar@gmail.com",
@@ -26,6 +27,9 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     cmdclass=versioneer.get_cmdclass(),
 )
diff --git a/venv_tools/__init__.py b/src/venv_tools/__init__.py
similarity index 100%
rename from venv_tools/__init__.py
rename to src/venv_tools/__init__.py
diff --git a/venv_tools/_utils.py b/src/venv_tools/_utils.py
similarity index 100%
rename from venv_tools/_utils.py
rename to src/venv_tools/_utils.py
diff --git a/venv_tools/_venv_builders.py b/src/venv_tools/_venv_builders.py
similarity index 100%
rename from venv_tools/_venv_builders.py
rename to src/venv_tools/_venv_builders.py
diff --git a/venv_tools/_version.py b/src/venv_tools/_version.py
similarity index 100%
rename from venv_tools/_version.py
rename to src/venv_tools/_version.py