diff --git a/.gitignore b/.gitignore
index 62e2b2c9..fe97dd9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ __pycache__
 .tox
 env*
 venv
+Pipfile*
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index b632b694..00000000
--- a/MANIFEST
+++ /dev/null
@@ -1,13 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-CHANGES.txt
-README.txt
-setup.py
-pydruid
-pydruid/__init__.py
-pydruid/async_client.py
-pydruid/client.py
-pydruid/utils/__init__.py
-pydruid/utils/aggregators.py
-pydruid/utils/filters.py
-pydruid/utils/postaggregator.py
-pydruid/utils/query_utils.py
diff --git a/MANIFEST.in b/MANIFEST.in
index 1cb2b718..44181656 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include *.txt
 include *.md
-recursive-include docs *.txt
-global-include pydruid *.py
+recursive-include docs
+recursive-include pydruid
 include LICENSE
diff --git a/setup.py b/setup.py
index bd1cc32a..5d661a12 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 import io
 import sys
-from setuptools import setup
+from setuptools import find_packages, setup
 
 install_requires = ["six >= 1.9.0", "requests"]
 
@@ -23,7 +23,8 @@
     version="0.999.0dev",
     author="Druid Developers",
     author_email="druid-development@googlegroups.com",
-    packages=["pydruid", "pydruid.db", "pydruid.utils"],
+    packages=find_packages("pydruid"),
+    package_dir={"": "pydruid"},
     url="https://druid.apache.org",
     project_urls={
         "Bug Tracker": "https://github.com/druid-io/pydruid/issues",
diff --git a/tox.ini b/tox.ini
index fb82c08d..99f082ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,6 @@
 [testenv]
+setenv =
+    PYTHONPATH = {toxinidir}
 commands =
     pytest {posargs}
 deps =