diff --git a/setup.py b/setup.py
index 0ae1fe7..1426518 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 
-with io.open('./beefore/__init__.py', encoding='utf8') as version_file:
+with io.open('./src/beefore/__init__.py', encoding='utf8') as version_file:
     version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file.read(), re.M)
     if version_match:
         version = version_match.group(1)
@@ -25,10 +25,11 @@
     author_email='russell@keith-magee.com',
     url='http://pybee.org/beefore',
     keywords=['lint', 'merge', 'dco'],
-    packages=find_packages(exclude=['tests']),
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
     entry_points={
         'console_scripts': [
-            'beefore = beefore.command:main',
+            'beefore = beefore.__main__:main',
         ]
     },
     install_requires=[
diff --git a/beefore/__init__.py b/src/beefore/__init__.py
similarity index 100%
rename from beefore/__init__.py
rename to src/beefore/__init__.py
diff --git a/beefore/__main__.py b/src/beefore/__main__.py
similarity index 100%
rename from beefore/__main__.py
rename to src/beefore/__main__.py
diff --git a/beefore/checks/__init__.py b/src/beefore/checks/__init__.py
similarity index 100%
rename from beefore/checks/__init__.py
rename to src/beefore/checks/__init__.py
diff --git a/beefore/checks/dco.py b/src/beefore/checks/dco.py
similarity index 100%
rename from beefore/checks/dco.py
rename to src/beefore/checks/dco.py
diff --git a/beefore/checks/eslint.py b/src/beefore/checks/eslint.py
similarity index 100%
rename from beefore/checks/eslint.py
rename to src/beefore/checks/eslint.py
diff --git a/beefore/checks/javacheckstyle.py b/src/beefore/checks/javacheckstyle.py
similarity index 100%
rename from beefore/checks/javacheckstyle.py
rename to src/beefore/checks/javacheckstyle.py
diff --git a/beefore/checks/pycodestyle.py b/src/beefore/checks/pycodestyle.py
similarity index 100%
rename from beefore/checks/pycodestyle.py
rename to src/beefore/checks/pycodestyle.py
diff --git a/beefore/diff.py b/src/beefore/diff.py
similarity index 100%
rename from beefore/diff.py
rename to src/beefore/diff.py
diff --git a/beefore/github.py b/src/beefore/github.py
similarity index 100%
rename from beefore/github.py
rename to src/beefore/github.py
diff --git a/beefore/local.py b/src/beefore/local.py
similarity index 100%
rename from beefore/local.py
rename to src/beefore/local.py