diff --git a/setup.py b/setup.py
index cada7efc..ca843b13 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ class PyTest(TestCommand):
         import pytest
         import sys
         import os
-        cmdline = ' --cov webagg -vv test/'
+        cmdline = ' --cov-config .coveragerc --cov webagg/ -vv webagg/test/'
         errcode = pytest.main(cmdline)
         sys.exit(errcode)
 
@@ -30,6 +30,7 @@ setup(
     long_description=open('README.rst').read(),
     provides=[
         'webagg',
+        'recorder',
         ],
     install_requires=[
         'pywb==1.0b',
diff --git a/README.rst b/webagg/README.rst
similarity index 100%
rename from README.rst
rename to webagg/README.rst
diff --git a/test/__init__.py b/webagg/test/__init__.py
similarity index 100%
rename from test/__init__.py
rename to webagg/test/__init__.py
diff --git a/test/test_dir_agg.py b/webagg/test/test_dir_agg.py
similarity index 100%
rename from test/test_dir_agg.py
rename to webagg/test/test_dir_agg.py
diff --git a/test/test_handlers.py b/webagg/test/test_handlers.py
similarity index 100%
rename from test/test_handlers.py
rename to webagg/test/test_handlers.py
diff --git a/test/test_indexsource.py b/webagg/test/test_indexsource.py
similarity index 100%
rename from test/test_indexsource.py
rename to webagg/test/test_indexsource.py
diff --git a/test/test_memento_agg.py b/webagg/test/test_memento_agg.py
similarity index 100%
rename from test/test_memento_agg.py
rename to webagg/test/test_memento_agg.py
diff --git a/test/test_timeouts.py b/webagg/test/test_timeouts.py
similarity index 100%
rename from test/test_timeouts.py
rename to webagg/test/test_timeouts.py
diff --git a/test/test_upstream.py b/webagg/test/test_upstream.py
similarity index 100%
rename from test/test_upstream.py
rename to webagg/test/test_upstream.py
diff --git a/test/testutils.py b/webagg/test/testutils.py
similarity index 100%
rename from test/testutils.py
rename to webagg/test/testutils.py