diff --git a/LICENSE.txt b/certbot/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to certbot/LICENSE.txt
diff --git a/MANIFEST.in b/certbot/MANIFEST.in
similarity index 100%
rename from MANIFEST.in
rename to certbot/MANIFEST.in
diff --git a/README.rst b/certbot/README.rst
similarity index 100%
rename from README.rst
rename to certbot/README.rst
diff --git a/certbot/__init__.py b/certbot/certbot/__init__.py
similarity index 100%
rename from certbot/__init__.py
rename to certbot/certbot/__init__.py
diff --git a/certbot/_internal/__init__.py b/certbot/certbot/_internal/__init__.py
similarity index 100%
rename from certbot/_internal/__init__.py
rename to certbot/certbot/_internal/__init__.py
diff --git a/certbot/_internal/account.py b/certbot/certbot/_internal/account.py
similarity index 100%
rename from certbot/_internal/account.py
rename to certbot/certbot/_internal/account.py
diff --git a/certbot/_internal/auth_handler.py b/certbot/certbot/_internal/auth_handler.py
similarity index 100%
rename from certbot/_internal/auth_handler.py
rename to certbot/certbot/_internal/auth_handler.py
diff --git a/certbot/_internal/cert_manager.py b/certbot/certbot/_internal/cert_manager.py
similarity index 100%
rename from certbot/_internal/cert_manager.py
rename to certbot/certbot/_internal/cert_manager.py
diff --git a/certbot/_internal/client.py b/certbot/certbot/_internal/client.py
similarity index 100%
rename from certbot/_internal/client.py
rename to certbot/certbot/_internal/client.py
diff --git a/certbot/_internal/constants.py b/certbot/certbot/_internal/constants.py
similarity index 100%
rename from certbot/_internal/constants.py
rename to certbot/certbot/_internal/constants.py
diff --git a/certbot/_internal/display/__init__.py b/certbot/certbot/_internal/display/__init__.py
similarity index 100%
rename from certbot/_internal/display/__init__.py
rename to certbot/certbot/_internal/display/__init__.py
diff --git a/certbot/_internal/display/completer.py b/certbot/certbot/_internal/display/completer.py
similarity index 100%
rename from certbot/_internal/display/completer.py
rename to certbot/certbot/_internal/display/completer.py
diff --git a/certbot/_internal/display/dummy_readline.py b/certbot/certbot/_internal/display/dummy_readline.py
similarity index 100%
rename from certbot/_internal/display/dummy_readline.py
rename to certbot/certbot/_internal/display/dummy_readline.py
diff --git a/certbot/_internal/display/enhancements.py b/certbot/certbot/_internal/display/enhancements.py
similarity index 100%
rename from certbot/_internal/display/enhancements.py
rename to certbot/certbot/_internal/display/enhancements.py
diff --git a/certbot/_internal/eff.py b/certbot/certbot/_internal/eff.py
similarity index 100%
rename from certbot/_internal/eff.py
rename to certbot/certbot/_internal/eff.py
diff --git a/certbot/_internal/error_handler.py b/certbot/certbot/_internal/error_handler.py
similarity index 100%
rename from certbot/_internal/error_handler.py
rename to certbot/certbot/_internal/error_handler.py
diff --git a/certbot/_internal/lock.py b/certbot/certbot/_internal/lock.py
similarity index 100%
rename from certbot/_internal/lock.py
rename to certbot/certbot/_internal/lock.py
diff --git a/certbot/_internal/log.py b/certbot/certbot/_internal/log.py
similarity index 100%
rename from certbot/_internal/log.py
rename to certbot/certbot/_internal/log.py
diff --git a/certbot/_internal/main.py b/certbot/certbot/_internal/main.py
similarity index 100%
rename from certbot/_internal/main.py
rename to certbot/certbot/_internal/main.py
diff --git a/certbot/_internal/notify.py b/certbot/certbot/_internal/notify.py
similarity index 100%
rename from certbot/_internal/notify.py
rename to certbot/certbot/_internal/notify.py
diff --git a/certbot/_internal/ocsp.py b/certbot/certbot/_internal/ocsp.py
similarity index 100%
rename from certbot/_internal/ocsp.py
rename to certbot/certbot/_internal/ocsp.py
diff --git a/certbot/_internal/plugins/__init__.py b/certbot/certbot/_internal/plugins/__init__.py
similarity index 100%
rename from certbot/_internal/plugins/__init__.py
rename to certbot/certbot/_internal/plugins/__init__.py
diff --git a/certbot/_internal/plugins/disco.py b/certbot/certbot/_internal/plugins/disco.py
similarity index 100%
rename from certbot/_internal/plugins/disco.py
rename to certbot/certbot/_internal/plugins/disco.py
diff --git a/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py
similarity index 100%
rename from certbot/_internal/plugins/manual.py
rename to certbot/certbot/_internal/plugins/manual.py
diff --git a/certbot/_internal/plugins/null.py b/certbot/certbot/_internal/plugins/null.py
similarity index 100%
rename from certbot/_internal/plugins/null.py
rename to certbot/certbot/_internal/plugins/null.py
diff --git a/certbot/_internal/plugins/selection.py b/certbot/certbot/_internal/plugins/selection.py
similarity index 100%
rename from certbot/_internal/plugins/selection.py
rename to certbot/certbot/_internal/plugins/selection.py
diff --git a/certbot/_internal/plugins/standalone.py b/certbot/certbot/_internal/plugins/standalone.py
similarity index 100%
rename from certbot/_internal/plugins/standalone.py
rename to certbot/certbot/_internal/plugins/standalone.py
diff --git a/certbot/_internal/plugins/webroot.py b/certbot/certbot/_internal/plugins/webroot.py
similarity index 100%
rename from certbot/_internal/plugins/webroot.py
rename to certbot/certbot/_internal/plugins/webroot.py
diff --git a/certbot/_internal/renewal.py b/certbot/certbot/_internal/renewal.py
similarity index 100%
rename from certbot/_internal/renewal.py
rename to certbot/certbot/_internal/renewal.py
diff --git a/certbot/_internal/reporter.py b/certbot/certbot/_internal/reporter.py
similarity index 100%
rename from certbot/_internal/reporter.py
rename to certbot/certbot/_internal/reporter.py
diff --git a/certbot/_internal/storage.py b/certbot/certbot/_internal/storage.py
similarity index 100%
rename from certbot/_internal/storage.py
rename to certbot/certbot/_internal/storage.py
diff --git a/certbot/_internal/updater.py b/certbot/certbot/_internal/updater.py
similarity index 100%
rename from certbot/_internal/updater.py
rename to certbot/certbot/_internal/updater.py
diff --git a/certbot/achallenges.py b/certbot/certbot/achallenges.py
similarity index 100%
rename from certbot/achallenges.py
rename to certbot/certbot/achallenges.py
diff --git a/certbot/cli.py b/certbot/certbot/cli.py
similarity index 100%
rename from certbot/cli.py
rename to certbot/certbot/cli.py
diff --git a/certbot/compat/__init__.py b/certbot/certbot/compat/__init__.py
similarity index 100%
rename from certbot/compat/__init__.py
rename to certbot/certbot/compat/__init__.py
diff --git a/certbot/compat/_path.py b/certbot/certbot/compat/_path.py
similarity index 100%
rename from certbot/compat/_path.py
rename to certbot/certbot/compat/_path.py
diff --git a/certbot/compat/filesystem.py b/certbot/certbot/compat/filesystem.py
similarity index 100%
rename from certbot/compat/filesystem.py
rename to certbot/certbot/compat/filesystem.py
diff --git a/certbot/compat/misc.py b/certbot/certbot/compat/misc.py
similarity index 100%
rename from certbot/compat/misc.py
rename to certbot/certbot/compat/misc.py
diff --git a/certbot/compat/os.py b/certbot/certbot/compat/os.py
similarity index 100%
rename from certbot/compat/os.py
rename to certbot/certbot/compat/os.py
diff --git a/certbot/configuration.py b/certbot/certbot/configuration.py
similarity index 100%
rename from certbot/configuration.py
rename to certbot/certbot/configuration.py
diff --git a/certbot/crypto_util.py b/certbot/certbot/crypto_util.py
similarity index 100%
rename from certbot/crypto_util.py
rename to certbot/certbot/crypto_util.py
diff --git a/certbot/display/__init__.py b/certbot/certbot/display/__init__.py
similarity index 100%
rename from certbot/display/__init__.py
rename to certbot/certbot/display/__init__.py
diff --git a/certbot/display/ops.py b/certbot/certbot/display/ops.py
similarity index 100%
rename from certbot/display/ops.py
rename to certbot/certbot/display/ops.py
diff --git a/certbot/display/util.py b/certbot/certbot/display/util.py
similarity index 100%
rename from certbot/display/util.py
rename to certbot/certbot/display/util.py
diff --git a/certbot/errors.py b/certbot/certbot/errors.py
similarity index 100%
rename from certbot/errors.py
rename to certbot/certbot/errors.py
diff --git a/certbot/hooks.py b/certbot/certbot/hooks.py
similarity index 100%
rename from certbot/hooks.py
rename to certbot/certbot/hooks.py
diff --git a/certbot/interfaces.py b/certbot/certbot/interfaces.py
similarity index 100%
rename from certbot/interfaces.py
rename to certbot/certbot/interfaces.py
diff --git a/certbot/plugins/__init__.py b/certbot/certbot/plugins/__init__.py
similarity index 100%
rename from certbot/plugins/__init__.py
rename to certbot/certbot/plugins/__init__.py
diff --git a/certbot/plugins/common.py b/certbot/certbot/plugins/common.py
similarity index 100%
rename from certbot/plugins/common.py
rename to certbot/certbot/plugins/common.py
diff --git a/certbot/plugins/common_test.py b/certbot/certbot/plugins/common_test.py
similarity index 100%
rename from certbot/plugins/common_test.py
rename to certbot/certbot/plugins/common_test.py
diff --git a/certbot/plugins/disco_test.py b/certbot/certbot/plugins/disco_test.py
similarity index 100%
rename from certbot/plugins/disco_test.py
rename to certbot/certbot/plugins/disco_test.py
diff --git a/certbot/plugins/dns_common.py b/certbot/certbot/plugins/dns_common.py
similarity index 100%
rename from certbot/plugins/dns_common.py
rename to certbot/certbot/plugins/dns_common.py
diff --git a/certbot/plugins/dns_common_lexicon.py b/certbot/certbot/plugins/dns_common_lexicon.py
similarity index 100%
rename from certbot/plugins/dns_common_lexicon.py
rename to certbot/certbot/plugins/dns_common_lexicon.py
diff --git a/certbot/plugins/dns_common_lexicon_test.py b/certbot/certbot/plugins/dns_common_lexicon_test.py
similarity index 100%
rename from certbot/plugins/dns_common_lexicon_test.py
rename to certbot/certbot/plugins/dns_common_lexicon_test.py
diff --git a/certbot/plugins/dns_common_test.py b/certbot/certbot/plugins/dns_common_test.py
similarity index 100%
rename from certbot/plugins/dns_common_test.py
rename to certbot/certbot/plugins/dns_common_test.py
diff --git a/certbot/plugins/dns_test_common.py b/certbot/certbot/plugins/dns_test_common.py
similarity index 100%
rename from certbot/plugins/dns_test_common.py
rename to certbot/certbot/plugins/dns_test_common.py
diff --git a/certbot/plugins/dns_test_common_lexicon.py b/certbot/certbot/plugins/dns_test_common_lexicon.py
similarity index 100%
rename from certbot/plugins/dns_test_common_lexicon.py
rename to certbot/certbot/plugins/dns_test_common_lexicon.py
diff --git a/certbot/plugins/enhancements.py b/certbot/certbot/plugins/enhancements.py
similarity index 100%
rename from certbot/plugins/enhancements.py
rename to certbot/certbot/plugins/enhancements.py
diff --git a/certbot/plugins/enhancements_test.py b/certbot/certbot/plugins/enhancements_test.py
similarity index 100%
rename from certbot/plugins/enhancements_test.py
rename to certbot/certbot/plugins/enhancements_test.py
diff --git a/certbot/plugins/manual_test.py b/certbot/certbot/plugins/manual_test.py
similarity index 100%
rename from certbot/plugins/manual_test.py
rename to certbot/certbot/plugins/manual_test.py
diff --git a/certbot/plugins/null_test.py b/certbot/certbot/plugins/null_test.py
similarity index 100%
rename from certbot/plugins/null_test.py
rename to certbot/certbot/plugins/null_test.py
diff --git a/certbot/plugins/selection_test.py b/certbot/certbot/plugins/selection_test.py
similarity index 100%
rename from certbot/plugins/selection_test.py
rename to certbot/certbot/plugins/selection_test.py
diff --git a/certbot/plugins/standalone_test.py b/certbot/certbot/plugins/standalone_test.py
similarity index 100%
rename from certbot/plugins/standalone_test.py
rename to certbot/certbot/plugins/standalone_test.py
diff --git a/certbot/plugins/storage.py b/certbot/certbot/plugins/storage.py
similarity index 100%
rename from certbot/plugins/storage.py
rename to certbot/certbot/plugins/storage.py
diff --git a/certbot/plugins/storage_test.py b/certbot/certbot/plugins/storage_test.py
similarity index 100%
rename from certbot/plugins/storage_test.py
rename to certbot/certbot/plugins/storage_test.py
diff --git a/certbot/plugins/util.py b/certbot/certbot/plugins/util.py
similarity index 100%
rename from certbot/plugins/util.py
rename to certbot/certbot/plugins/util.py
diff --git a/certbot/plugins/util_test.py b/certbot/certbot/plugins/util_test.py
similarity index 100%
rename from certbot/plugins/util_test.py
rename to certbot/certbot/plugins/util_test.py
diff --git a/certbot/plugins/webroot_test.py b/certbot/certbot/plugins/webroot_test.py
similarity index 100%
rename from certbot/plugins/webroot_test.py
rename to certbot/certbot/plugins/webroot_test.py
diff --git a/certbot/reverter.py b/certbot/certbot/reverter.py
similarity index 100%
rename from certbot/reverter.py
rename to certbot/certbot/reverter.py
diff --git a/certbot/ssl-dhparams.pem b/certbot/certbot/ssl-dhparams.pem
similarity index 100%
rename from certbot/ssl-dhparams.pem
rename to certbot/certbot/ssl-dhparams.pem
diff --git a/certbot/certbot/tests/__init__.py b/certbot/certbot/tests/__init__.py
new file mode 100644
index 000000000..2f4d6e07c
--- /dev/null
+++ b/certbot/certbot/tests/__init__.py
@@ -0,0 +1 @@
+"""Certbot Tests"""
diff --git a/certbot/tests/acme_util.py b/certbot/certbot/tests/acme_util.py
similarity index 100%
rename from certbot/tests/acme_util.py
rename to certbot/certbot/tests/acme_util.py
diff --git a/certbot/tests/util.py b/certbot/certbot/tests/util.py
similarity index 100%
rename from certbot/tests/util.py
rename to certbot/certbot/tests/util.py
diff --git a/certbot/util.py b/certbot/certbot/util.py
similarity index 100%
rename from certbot/util.py
rename to certbot/certbot/util.py
diff --git a/docs/.gitignore b/certbot/docs/.gitignore
similarity index 100%
rename from docs/.gitignore
rename to certbot/docs/.gitignore
diff --git a/docs/Makefile b/certbot/docs/Makefile
similarity index 100%
rename from docs/Makefile
rename to certbot/docs/Makefile
diff --git a/docs/_static/.gitignore b/certbot/docs/_static/.gitignore
similarity index 100%
rename from docs/_static/.gitignore
rename to certbot/docs/_static/.gitignore
diff --git a/docs/_templates/footer.html b/certbot/docs/_templates/footer.html
similarity index 100%
rename from docs/_templates/footer.html
rename to certbot/docs/_templates/footer.html
diff --git a/docs/api.rst b/certbot/docs/api.rst
similarity index 100%
rename from docs/api.rst
rename to certbot/docs/api.rst
diff --git a/docs/api/achallenges.rst b/certbot/docs/api/achallenges.rst
similarity index 100%
rename from docs/api/achallenges.rst
rename to certbot/docs/api/achallenges.rst
diff --git a/docs/api/cli.rst b/certbot/docs/api/cli.rst
similarity index 100%
rename from docs/api/cli.rst
rename to certbot/docs/api/cli.rst
diff --git a/docs/api/configuration.rst b/certbot/docs/api/configuration.rst
similarity index 100%
rename from docs/api/configuration.rst
rename to certbot/docs/api/configuration.rst
diff --git a/docs/api/crypto_util.rst b/certbot/docs/api/crypto_util.rst
similarity index 100%
rename from docs/api/crypto_util.rst
rename to certbot/docs/api/crypto_util.rst
diff --git a/docs/api/display.rst b/certbot/docs/api/display.rst
similarity index 100%
rename from docs/api/display.rst
rename to certbot/docs/api/display.rst
diff --git a/docs/api/errors.rst b/certbot/docs/api/errors.rst
similarity index 100%
rename from docs/api/errors.rst
rename to certbot/docs/api/errors.rst
diff --git a/docs/api/hooks.rst b/certbot/docs/api/hooks.rst
similarity index 100%
rename from docs/api/hooks.rst
rename to certbot/docs/api/hooks.rst
diff --git a/docs/api/index.rst b/certbot/docs/api/index.rst
similarity index 100%
rename from docs/api/index.rst
rename to certbot/docs/api/index.rst
diff --git a/docs/api/interfaces.rst b/certbot/docs/api/interfaces.rst
similarity index 100%
rename from docs/api/interfaces.rst
rename to certbot/docs/api/interfaces.rst
diff --git a/docs/api/plugins/common.rst b/certbot/docs/api/plugins/common.rst
similarity index 100%
rename from docs/api/plugins/common.rst
rename to certbot/docs/api/plugins/common.rst
diff --git a/docs/api/plugins/dns_common.rst b/certbot/docs/api/plugins/dns_common.rst
similarity index 100%
rename from docs/api/plugins/dns_common.rst
rename to certbot/docs/api/plugins/dns_common.rst
diff --git a/docs/api/plugins/dns_common_lexicon.rst b/certbot/docs/api/plugins/dns_common_lexicon.rst
similarity index 100%
rename from docs/api/plugins/dns_common_lexicon.rst
rename to certbot/docs/api/plugins/dns_common_lexicon.rst
diff --git a/docs/api/plugins/util.rst b/certbot/docs/api/plugins/util.rst
similarity index 100%
rename from docs/api/plugins/util.rst
rename to certbot/docs/api/plugins/util.rst
diff --git a/docs/api/reverter.rst b/certbot/docs/api/reverter.rst
similarity index 100%
rename from docs/api/reverter.rst
rename to certbot/docs/api/reverter.rst
diff --git a/docs/api/util.rst b/certbot/docs/api/util.rst
similarity index 100%
rename from docs/api/util.rst
rename to certbot/docs/api/util.rst
diff --git a/docs/challenges.rst b/certbot/docs/challenges.rst
similarity index 100%
rename from docs/challenges.rst
rename to certbot/docs/challenges.rst
diff --git a/docs/ciphers.rst b/certbot/docs/ciphers.rst
similarity index 100%
rename from docs/ciphers.rst
rename to certbot/docs/ciphers.rst
diff --git a/docs/cli-help.txt b/certbot/docs/cli-help.txt
similarity index 100%
rename from docs/cli-help.txt
rename to certbot/docs/cli-help.txt
diff --git a/docs/conf.py b/certbot/docs/conf.py
similarity index 100%
rename from docs/conf.py
rename to certbot/docs/conf.py
diff --git a/docs/contributing.rst b/certbot/docs/contributing.rst
similarity index 100%
rename from docs/contributing.rst
rename to certbot/docs/contributing.rst
diff --git a/docs/index.rst b/certbot/docs/index.rst
similarity index 100%
rename from docs/index.rst
rename to certbot/docs/index.rst
diff --git a/docs/install.rst b/certbot/docs/install.rst
similarity index 100%
rename from docs/install.rst
rename to certbot/docs/install.rst
diff --git a/docs/intro.rst b/certbot/docs/intro.rst
similarity index 100%
rename from docs/intro.rst
rename to certbot/docs/intro.rst
diff --git a/docs/make.bat b/certbot/docs/make.bat
similarity index 100%
rename from docs/make.bat
rename to certbot/docs/make.bat
diff --git a/docs/man/certbot.rst b/certbot/docs/man/certbot.rst
similarity index 100%
rename from docs/man/certbot.rst
rename to certbot/docs/man/certbot.rst
diff --git a/docs/packaging.rst b/certbot/docs/packaging.rst
similarity index 100%
rename from docs/packaging.rst
rename to certbot/docs/packaging.rst
diff --git a/docs/resources.rst b/certbot/docs/resources.rst
similarity index 100%
rename from docs/resources.rst
rename to certbot/docs/resources.rst
diff --git a/docs/using.rst b/certbot/docs/using.rst
similarity index 100%
rename from docs/using.rst
rename to certbot/docs/using.rst
diff --git a/docs/what.rst b/certbot/docs/what.rst
similarity index 100%
rename from docs/what.rst
rename to certbot/docs/what.rst
diff --git a/local-oldest-requirements.txt b/certbot/local-oldest-requirements.txt
similarity index 100%
rename from local-oldest-requirements.txt
rename to certbot/local-oldest-requirements.txt
diff --git a/readthedocs.org.requirements.txt b/certbot/readthedocs.org.requirements.txt
similarity index 100%
rename from readthedocs.org.requirements.txt
rename to certbot/readthedocs.org.requirements.txt
diff --git a/setup.cfg b/certbot/setup.cfg
similarity index 100%
rename from setup.cfg
rename to certbot/setup.cfg
diff --git a/setup.py b/certbot/setup.py
similarity index 100%
rename from setup.py
rename to certbot/setup.py