diff --git a/__init__.py b/pyu2f/__init__.py
similarity index 100%
rename from __init__.py
rename to pyu2f/__init__.py
diff --git a/apdu.py b/pyu2f/apdu.py
similarity index 100%
rename from apdu.py
rename to pyu2f/apdu.py
diff --git a/convenience/__init__.py b/pyu2f/convenience/__init__.py
similarity index 100%
rename from convenience/__init__.py
rename to pyu2f/convenience/__init__.py
diff --git a/convenience/authenticator.py b/pyu2f/convenience/authenticator.py
similarity index 100%
rename from convenience/authenticator.py
rename to pyu2f/convenience/authenticator.py
diff --git a/convenience/baseauthenticator.py b/pyu2f/convenience/baseauthenticator.py
similarity index 100%
rename from convenience/baseauthenticator.py
rename to pyu2f/convenience/baseauthenticator.py
diff --git a/convenience/customauthenticator.py b/pyu2f/convenience/customauthenticator.py
similarity index 100%
rename from convenience/customauthenticator.py
rename to pyu2f/convenience/customauthenticator.py
diff --git a/convenience/localauthenticator.py b/pyu2f/convenience/localauthenticator.py
similarity index 100%
rename from convenience/localauthenticator.py
rename to pyu2f/convenience/localauthenticator.py
diff --git a/errors.py b/pyu2f/errors.py
similarity index 100%
rename from errors.py
rename to pyu2f/errors.py
diff --git a/hardware.py b/pyu2f/hardware.py
similarity index 100%
rename from hardware.py
rename to pyu2f/hardware.py
diff --git a/hid/__init__.py b/pyu2f/hid/__init__.py
similarity index 100%
rename from hid/__init__.py
rename to pyu2f/hid/__init__.py
diff --git a/hid/base.py b/pyu2f/hid/base.py
similarity index 100%
rename from hid/base.py
rename to pyu2f/hid/base.py
diff --git a/hid/linux.py b/pyu2f/hid/linux.py
similarity index 100%
rename from hid/linux.py
rename to pyu2f/hid/linux.py
diff --git a/hid/macos.py b/pyu2f/hid/macos.py
similarity index 100%
rename from hid/macos.py
rename to pyu2f/hid/macos.py
diff --git a/hid/try.py b/pyu2f/hid/try.py
similarity index 100%
rename from hid/try.py
rename to pyu2f/hid/try.py
diff --git a/hid/windows.py b/pyu2f/hid/windows.py
similarity index 100%
rename from hid/windows.py
rename to pyu2f/hid/windows.py
diff --git a/hidtransport.py b/pyu2f/hidtransport.py
similarity index 100%
rename from hidtransport.py
rename to pyu2f/hidtransport.py
diff --git a/model.py b/pyu2f/model.py
similarity index 100%
rename from model.py
rename to pyu2f/model.py
diff --git a/tests/__init__.py b/pyu2f/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to pyu2f/tests/__init__.py
diff --git a/tests/apdu_test.py b/pyu2f/tests/apdu_test.py
similarity index 100%
rename from tests/apdu_test.py
rename to pyu2f/tests/apdu_test.py
diff --git a/tests/customauthenticator_test.py b/pyu2f/tests/customauthenticator_test.py
similarity index 100%
rename from tests/customauthenticator_test.py
rename to pyu2f/tests/customauthenticator_test.py
diff --git a/tests/hardware_test.py b/pyu2f/tests/hardware_test.py
similarity index 100%
rename from tests/hardware_test.py
rename to pyu2f/tests/hardware_test.py
diff --git a/tests/hid/linux_test.py b/pyu2f/tests/hid/linux_test.py
similarity index 100%
rename from tests/hid/linux_test.py
rename to pyu2f/tests/hid/linux_test.py
diff --git a/tests/hid/macos_test.py b/pyu2f/tests/hid/macos_test.py
similarity index 100%
rename from tests/hid/macos_test.py
rename to pyu2f/tests/hid/macos_test.py
diff --git a/tests/hidtransport_test.py b/pyu2f/tests/hidtransport_test.py
similarity index 100%
rename from tests/hidtransport_test.py
rename to pyu2f/tests/hidtransport_test.py
diff --git a/tests/lib/__init__.py b/pyu2f/tests/lib/__init__.py
similarity index 100%
rename from tests/lib/__init__.py
rename to pyu2f/tests/lib/__init__.py
diff --git a/tests/lib/util.py b/pyu2f/tests/lib/util.py
similarity index 100%
rename from tests/lib/util.py
rename to pyu2f/tests/lib/util.py
diff --git a/tests/localauthenticator_test.py b/pyu2f/tests/localauthenticator_test.py
similarity index 100%
rename from tests/localauthenticator_test.py
rename to pyu2f/tests/localauthenticator_test.py
diff --git a/tests/model_test.py b/pyu2f/tests/model_test.py
similarity index 100%
rename from tests/model_test.py
rename to pyu2f/tests/model_test.py
diff --git a/tests/u2f_test.py b/pyu2f/tests/u2f_test.py
similarity index 100%
rename from tests/u2f_test.py
rename to pyu2f/tests/u2f_test.py
diff --git a/tests/util_test.py b/pyu2f/tests/util_test.py
similarity index 100%
rename from tests/util_test.py
rename to pyu2f/tests/util_test.py
diff --git a/u2f.py b/pyu2f/u2f.py
similarity index 100%
rename from u2f.py
rename to pyu2f/u2f.py
diff --git a/setup.py b/setup.py
index 2e3bed1..347b4dd 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
 
 setuptools.setup(
     name='pyu2f',
-    version='0.1.0',
+    version='0.1.1',
     description='U2F host library for interacting with a U2F device over USB.',
     long_description='pyu2f is a python based U2F host library for Linux, '
                      'Windows, and MacOS. It provides functionality for '
@@ -35,7 +35,7 @@
     author='Google Inc.',
     author_email='pyu2f-team@google.com',
     # Contained modules and scripts.
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_packages(exclude=["pyu2f.tests", "pyu2f.tests.*"]),
     install_requires=[],
     tests_require=[
         'unittest2>=0.5.1',
diff --git a/tox.ini b/tox.ini
index a6933f4..c4fb792 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,5 +6,5 @@ skipsdist = True
 deps=pytest
      pyfakefs
      mock
-commands=py.test tests/
+commands=py.test pyu2f/tests/