diff --git a/recorder/__init__.py b/pywb/recorder/__init__.py similarity index 100% rename from recorder/__init__.py rename to pywb/recorder/__init__.py diff --git a/recorder/filters.py b/pywb/recorder/filters.py similarity index 100% rename from recorder/filters.py rename to pywb/recorder/filters.py diff --git a/recorder/recorderapp.py b/pywb/recorder/recorderapp.py similarity index 100% rename from recorder/recorderapp.py rename to pywb/recorder/recorderapp.py diff --git a/recorder/redisindexer.py b/pywb/recorder/redisindexer.py similarity index 100% rename from recorder/redisindexer.py rename to pywb/recorder/redisindexer.py diff --git a/recorder/test/rec.ini b/pywb/recorder/test/rec.ini similarity index 100% rename from recorder/test/rec.ini rename to pywb/recorder/test/rec.ini diff --git a/recorder/test/simplerec.py b/pywb/recorder/test/simplerec.py similarity index 100% rename from recorder/test/simplerec.py rename to pywb/recorder/test/simplerec.py diff --git a/recorder/test/test_recorder.py b/pywb/recorder/test/test_recorder.py similarity index 100% rename from recorder/test/test_recorder.py rename to pywb/recorder/test/test_recorder.py diff --git a/recorder/warcwriter.py b/pywb/recorder/warcwriter.py similarity index 100% rename from recorder/warcwriter.py rename to pywb/recorder/warcwriter.py diff --git a/urlrewrite/__init__.py b/pywb/urlrewrite/__init__.py similarity index 100% rename from urlrewrite/__init__.py rename to pywb/urlrewrite/__init__.py diff --git a/urlrewrite/cookies.py b/pywb/urlrewrite/cookies.py similarity index 100% rename from urlrewrite/cookies.py rename to pywb/urlrewrite/cookies.py diff --git a/urlrewrite/platformhandler.py b/pywb/urlrewrite/platformhandler.py similarity index 100% rename from urlrewrite/platformhandler.py rename to pywb/urlrewrite/platformhandler.py diff --git a/urlrewrite/rewriteinputreq.py b/pywb/urlrewrite/rewriteinputreq.py similarity index 100% rename from urlrewrite/rewriteinputreq.py rename to pywb/urlrewrite/rewriteinputreq.py diff --git a/urlrewrite/rewriterapp.py b/pywb/urlrewrite/rewriterapp.py similarity index 100% rename from urlrewrite/rewriterapp.py rename to pywb/urlrewrite/rewriterapp.py diff --git a/urlrewrite/templateview.py b/pywb/urlrewrite/templateview.py similarity index 100% rename from urlrewrite/templateview.py rename to pywb/urlrewrite/templateview.py diff --git a/urlrewrite/test/__init__.py b/pywb/urlrewrite/test/__init__.py similarity index 100% rename from urlrewrite/test/__init__.py rename to pywb/urlrewrite/test/__init__.py diff --git a/urlrewrite/test/simpleapp.py b/pywb/urlrewrite/test/simpleapp.py similarity index 100% rename from urlrewrite/test/simpleapp.py rename to pywb/urlrewrite/test/simpleapp.py diff --git a/urlrewrite/test/test_rewriter.py b/pywb/urlrewrite/test/test_rewriter.py similarity index 100% rename from urlrewrite/test/test_rewriter.py rename to pywb/urlrewrite/test/test_rewriter.py diff --git a/urlrewrite/test/uwsgi.ini b/pywb/urlrewrite/test/uwsgi.ini similarity index 100% rename from urlrewrite/test/uwsgi.ini rename to pywb/urlrewrite/test/uwsgi.ini diff --git a/webagg/Dockerfile b/pywb/webagg/Dockerfile similarity index 100% rename from webagg/Dockerfile rename to pywb/webagg/Dockerfile diff --git a/webagg/README.rst b/pywb/webagg/README.rst similarity index 100% rename from webagg/README.rst rename to pywb/webagg/README.rst diff --git a/webagg/__init__.py b/pywb/webagg/__init__.py similarity index 100% rename from webagg/__init__.py rename to pywb/webagg/__init__.py diff --git a/webagg/aggregator.py b/pywb/webagg/aggregator.py similarity index 100% rename from webagg/aggregator.py rename to pywb/webagg/aggregator.py diff --git a/webagg/app.py b/pywb/webagg/app.py similarity index 100% rename from webagg/app.py rename to pywb/webagg/app.py diff --git a/webagg/handlers.py b/pywb/webagg/handlers.py similarity index 100% rename from webagg/handlers.py rename to pywb/webagg/handlers.py diff --git a/webagg/indexsource.py b/pywb/webagg/indexsource.py similarity index 100% rename from webagg/indexsource.py rename to pywb/webagg/indexsource.py diff --git a/webagg/inputrequest.py b/pywb/webagg/inputrequest.py similarity index 100% rename from webagg/inputrequest.py rename to pywb/webagg/inputrequest.py diff --git a/webagg/proxyindexsource.py b/pywb/webagg/proxyindexsource.py similarity index 100% rename from webagg/proxyindexsource.py rename to pywb/webagg/proxyindexsource.py diff --git a/webagg/responseloader.py b/pywb/webagg/responseloader.py similarity index 100% rename from webagg/responseloader.py rename to pywb/webagg/responseloader.py diff --git a/webagg/test/__init__.py b/pywb/webagg/test/__init__.py similarity index 100% rename from webagg/test/__init__.py rename to pywb/webagg/test/__init__.py diff --git a/webagg/test/live.ini b/pywb/webagg/test/live.ini similarity index 100% rename from webagg/test/live.ini rename to pywb/webagg/test/live.ini diff --git a/webagg/test/live.py b/pywb/webagg/test/live.py similarity index 100% rename from webagg/test/live.py rename to pywb/webagg/test/live.py diff --git a/webagg/test/test_dir_agg.py b/pywb/webagg/test/test_dir_agg.py similarity index 100% rename from webagg/test/test_dir_agg.py rename to pywb/webagg/test/test_dir_agg.py diff --git a/webagg/test/test_handlers.py b/pywb/webagg/test/test_handlers.py similarity index 100% rename from webagg/test/test_handlers.py rename to pywb/webagg/test/test_handlers.py diff --git a/webagg/test/test_indexsource.py b/pywb/webagg/test/test_indexsource.py similarity index 100% rename from webagg/test/test_indexsource.py rename to pywb/webagg/test/test_indexsource.py diff --git a/webagg/test/test_inputreq.py b/pywb/webagg/test/test_inputreq.py similarity index 100% rename from webagg/test/test_inputreq.py rename to pywb/webagg/test/test_inputreq.py diff --git a/webagg/test/test_memento_agg.py b/pywb/webagg/test/test_memento_agg.py similarity index 100% rename from webagg/test/test_memento_agg.py rename to pywb/webagg/test/test_memento_agg.py diff --git a/webagg/test/test_redis_agg.py b/pywb/webagg/test/test_redis_agg.py similarity index 100% rename from webagg/test/test_redis_agg.py rename to pywb/webagg/test/test_redis_agg.py diff --git a/webagg/test/test_timeouts.py b/pywb/webagg/test/test_timeouts.py similarity index 100% rename from webagg/test/test_timeouts.py rename to pywb/webagg/test/test_timeouts.py diff --git a/webagg/test/test_upstream.py b/pywb/webagg/test/test_upstream.py similarity index 100% rename from webagg/test/test_upstream.py rename to pywb/webagg/test/test_upstream.py diff --git a/webagg/test/testutils.py b/pywb/webagg/test/testutils.py similarity index 100% rename from webagg/test/testutils.py rename to pywb/webagg/test/testutils.py diff --git a/webagg/utils.py b/pywb/webagg/utils.py similarity index 100% rename from webagg/utils.py rename to pywb/webagg/utils.py