diff --git a/acme/__init__.py b/acme/acme/__init__.py
similarity index 100%
rename from acme/__init__.py
rename to acme/acme/__init__.py
diff --git a/acme/challenges.py b/acme/acme/challenges.py
similarity index 100%
rename from acme/challenges.py
rename to acme/acme/challenges.py
diff --git a/acme/challenges_test.py b/acme/acme/challenges_test.py
similarity index 100%
rename from acme/challenges_test.py
rename to acme/acme/challenges_test.py
diff --git a/acme/client.py b/acme/acme/client.py
similarity index 100%
rename from acme/client.py
rename to acme/acme/client.py
diff --git a/acme/client_test.py b/acme/acme/client_test.py
similarity index 100%
rename from acme/client_test.py
rename to acme/acme/client_test.py
diff --git a/acme/errors.py b/acme/acme/errors.py
similarity index 100%
rename from acme/errors.py
rename to acme/acme/errors.py
diff --git a/acme/errors_test.py b/acme/acme/errors_test.py
similarity index 100%
rename from acme/errors_test.py
rename to acme/acme/errors_test.py
diff --git a/acme/fields.py b/acme/acme/fields.py
similarity index 100%
rename from acme/fields.py
rename to acme/acme/fields.py
diff --git a/acme/fields_test.py b/acme/acme/fields_test.py
similarity index 100%
rename from acme/fields_test.py
rename to acme/acme/fields_test.py
diff --git a/acme/interfaces.py b/acme/acme/interfaces.py
similarity index 100%
rename from acme/interfaces.py
rename to acme/acme/interfaces.py
diff --git a/acme/jose/__init__.py b/acme/acme/jose/__init__.py
similarity index 100%
rename from acme/jose/__init__.py
rename to acme/acme/jose/__init__.py
diff --git a/acme/jose/b64.py b/acme/acme/jose/b64.py
similarity index 100%
rename from acme/jose/b64.py
rename to acme/acme/jose/b64.py
diff --git a/acme/jose/b64_test.py b/acme/acme/jose/b64_test.py
similarity index 100%
rename from acme/jose/b64_test.py
rename to acme/acme/jose/b64_test.py
diff --git a/acme/jose/errors.py b/acme/acme/jose/errors.py
similarity index 100%
rename from acme/jose/errors.py
rename to acme/acme/jose/errors.py
diff --git a/acme/jose/errors_test.py b/acme/acme/jose/errors_test.py
similarity index 100%
rename from acme/jose/errors_test.py
rename to acme/acme/jose/errors_test.py
diff --git a/acme/jose/interfaces.py b/acme/acme/jose/interfaces.py
similarity index 100%
rename from acme/jose/interfaces.py
rename to acme/acme/jose/interfaces.py
diff --git a/acme/jose/interfaces_test.py b/acme/acme/jose/interfaces_test.py
similarity index 100%
rename from acme/jose/interfaces_test.py
rename to acme/acme/jose/interfaces_test.py
diff --git a/acme/jose/json_util.py b/acme/acme/jose/json_util.py
similarity index 100%
rename from acme/jose/json_util.py
rename to acme/acme/jose/json_util.py
diff --git a/acme/jose/json_util_test.py b/acme/acme/jose/json_util_test.py
similarity index 100%
rename from acme/jose/json_util_test.py
rename to acme/acme/jose/json_util_test.py
diff --git a/acme/jose/jwa.py b/acme/acme/jose/jwa.py
similarity index 100%
rename from acme/jose/jwa.py
rename to acme/acme/jose/jwa.py
diff --git a/acme/jose/jwa_test.py b/acme/acme/jose/jwa_test.py
similarity index 100%
rename from acme/jose/jwa_test.py
rename to acme/acme/jose/jwa_test.py
diff --git a/acme/jose/jwk.py b/acme/acme/jose/jwk.py
similarity index 100%
rename from acme/jose/jwk.py
rename to acme/acme/jose/jwk.py
diff --git a/acme/jose/jwk_test.py b/acme/acme/jose/jwk_test.py
similarity index 100%
rename from acme/jose/jwk_test.py
rename to acme/acme/jose/jwk_test.py
diff --git a/acme/jose/jws.py b/acme/acme/jose/jws.py
similarity index 100%
rename from acme/jose/jws.py
rename to acme/acme/jose/jws.py
diff --git a/acme/jose/jws_test.py b/acme/acme/jose/jws_test.py
similarity index 100%
rename from acme/jose/jws_test.py
rename to acme/acme/jose/jws_test.py
diff --git a/acme/jose/util.py b/acme/acme/jose/util.py
similarity index 100%
rename from acme/jose/util.py
rename to acme/acme/jose/util.py
diff --git a/acme/jose/util_test.py b/acme/acme/jose/util_test.py
similarity index 100%
rename from acme/jose/util_test.py
rename to acme/acme/jose/util_test.py
diff --git a/acme/jws.py b/acme/acme/jws.py
similarity index 100%
rename from acme/jws.py
rename to acme/acme/jws.py
diff --git a/acme/jws_test.py b/acme/acme/jws_test.py
similarity index 100%
rename from acme/jws_test.py
rename to acme/acme/jws_test.py
diff --git a/acme/messages.py b/acme/acme/messages.py
similarity index 100%
rename from acme/messages.py
rename to acme/acme/messages.py
diff --git a/acme/messages_test.py b/acme/acme/messages_test.py
similarity index 100%
rename from acme/messages_test.py
rename to acme/acme/messages_test.py
diff --git a/acme/other.py b/acme/acme/other.py
similarity index 100%
rename from acme/other.py
rename to acme/acme/other.py
diff --git a/acme/other_test.py b/acme/acme/other_test.py
similarity index 100%
rename from acme/other_test.py
rename to acme/acme/other_test.py
diff --git a/acme/test_util.py b/acme/acme/test_util.py
similarity index 100%
rename from acme/test_util.py
rename to acme/acme/test_util.py
diff --git a/acme/testdata/README b/acme/acme/testdata/README
similarity index 100%
rename from acme/testdata/README
rename to acme/acme/testdata/README
diff --git a/acme/testdata/cert-san.pem b/acme/acme/testdata/cert-san.pem
similarity index 100%
rename from acme/testdata/cert-san.pem
rename to acme/acme/testdata/cert-san.pem
diff --git a/acme/testdata/cert.der b/acme/acme/testdata/cert.der
similarity index 100%
rename from acme/testdata/cert.der
rename to acme/acme/testdata/cert.der
diff --git a/acme/testdata/cert.pem b/acme/acme/testdata/cert.pem
similarity index 100%
rename from acme/testdata/cert.pem
rename to acme/acme/testdata/cert.pem
diff --git a/acme/testdata/csr-san.pem b/acme/acme/testdata/csr-san.pem
similarity index 100%
rename from acme/testdata/csr-san.pem
rename to acme/acme/testdata/csr-san.pem
diff --git a/acme/testdata/csr.der b/acme/acme/testdata/csr.der
similarity index 100%
rename from acme/testdata/csr.der
rename to acme/acme/testdata/csr.der
diff --git a/acme/testdata/csr.pem b/acme/acme/testdata/csr.pem
similarity index 100%
rename from acme/testdata/csr.pem
rename to acme/acme/testdata/csr.pem
diff --git a/acme/testdata/dsa512_key.pem b/acme/acme/testdata/dsa512_key.pem
similarity index 100%
rename from acme/testdata/dsa512_key.pem
rename to acme/acme/testdata/dsa512_key.pem
diff --git a/acme/testdata/rsa1024_key.pem b/acme/acme/testdata/rsa1024_key.pem
similarity index 100%
rename from acme/testdata/rsa1024_key.pem
rename to acme/acme/testdata/rsa1024_key.pem
diff --git a/acme/testdata/rsa256_key.pem b/acme/acme/testdata/rsa256_key.pem
similarity index 100%
rename from acme/testdata/rsa256_key.pem
rename to acme/acme/testdata/rsa256_key.pem
diff --git a/acme/testdata/rsa512_key.pem b/acme/acme/testdata/rsa512_key.pem
similarity index 100%
rename from acme/testdata/rsa512_key.pem
rename to acme/acme/testdata/rsa512_key.pem
diff --git a/letsencrypt_apache/__init__.py b/letsencrypt_apache/letsencrypt_apache/__init__.py
similarity index 100%
rename from letsencrypt_apache/__init__.py
rename to letsencrypt_apache/letsencrypt_apache/__init__.py
diff --git a/letsencrypt_apache/augeas_configurator.py b/letsencrypt_apache/letsencrypt_apache/augeas_configurator.py
similarity index 100%
rename from letsencrypt_apache/augeas_configurator.py
rename to letsencrypt_apache/letsencrypt_apache/augeas_configurator.py
diff --git a/letsencrypt_apache/configurator.py b/letsencrypt_apache/letsencrypt_apache/configurator.py
similarity index 100%
rename from letsencrypt_apache/configurator.py
rename to letsencrypt_apache/letsencrypt_apache/configurator.py
diff --git a/letsencrypt_apache/constants.py b/letsencrypt_apache/letsencrypt_apache/constants.py
similarity index 100%
rename from letsencrypt_apache/constants.py
rename to letsencrypt_apache/letsencrypt_apache/constants.py
diff --git a/letsencrypt_apache/display_ops.py b/letsencrypt_apache/letsencrypt_apache/display_ops.py
similarity index 100%
rename from letsencrypt_apache/display_ops.py
rename to letsencrypt_apache/letsencrypt_apache/display_ops.py
diff --git a/letsencrypt_apache/dvsni.py b/letsencrypt_apache/letsencrypt_apache/dvsni.py
similarity index 100%
rename from letsencrypt_apache/dvsni.py
rename to letsencrypt_apache/letsencrypt_apache/dvsni.py
diff --git a/letsencrypt_apache/obj.py b/letsencrypt_apache/letsencrypt_apache/obj.py
similarity index 100%
rename from letsencrypt_apache/obj.py
rename to letsencrypt_apache/letsencrypt_apache/obj.py
diff --git a/letsencrypt_apache/options-ssl-apache.conf b/letsencrypt_apache/letsencrypt_apache/options-ssl-apache.conf
similarity index 100%
rename from letsencrypt_apache/options-ssl-apache.conf
rename to letsencrypt_apache/letsencrypt_apache/options-ssl-apache.conf
diff --git a/letsencrypt_apache/parser.py b/letsencrypt_apache/letsencrypt_apache/parser.py
similarity index 100%
rename from letsencrypt_apache/parser.py
rename to letsencrypt_apache/letsencrypt_apache/parser.py
diff --git a/letsencrypt_apache/tests/__init__.py b/letsencrypt_apache/letsencrypt_apache/tests/__init__.py
similarity index 100%
rename from letsencrypt_apache/tests/__init__.py
rename to letsencrypt_apache/letsencrypt_apache/tests/__init__.py
diff --git a/letsencrypt_apache/tests/configurator_test.py b/letsencrypt_apache/letsencrypt_apache/tests/configurator_test.py
similarity index 100%
rename from letsencrypt_apache/tests/configurator_test.py
rename to letsencrypt_apache/letsencrypt_apache/tests/configurator_test.py
diff --git a/letsencrypt_apache/tests/display_ops_test.py b/letsencrypt_apache/letsencrypt_apache/tests/display_ops_test.py
similarity index 100%
rename from letsencrypt_apache/tests/display_ops_test.py
rename to letsencrypt_apache/letsencrypt_apache/tests/display_ops_test.py
diff --git a/letsencrypt_apache/tests/dvsni_test.py b/letsencrypt_apache/letsencrypt_apache/tests/dvsni_test.py
similarity index 100%
rename from letsencrypt_apache/tests/dvsni_test.py
rename to letsencrypt_apache/letsencrypt_apache/tests/dvsni_test.py
diff --git a/letsencrypt_apache/tests/obj_test.py b/letsencrypt_apache/letsencrypt_apache/tests/obj_test.py
similarity index 100%
rename from letsencrypt_apache/tests/obj_test.py
rename to letsencrypt_apache/letsencrypt_apache/tests/obj_test.py
diff --git a/letsencrypt_apache/tests/parser_test.py b/letsencrypt_apache/letsencrypt_apache/tests/parser_test.py
similarity index 100%
rename from letsencrypt_apache/tests/parser_test.py
rename to letsencrypt_apache/letsencrypt_apache/tests/parser_test.py
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/default_vhost/sites
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/apache2.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/apache2.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/apache2.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/apache2.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/other-vhosts-access-log.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/other-vhosts-access-log.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/security.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/security.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/security.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/security.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/serve-cgi-bin.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/serve-cgi-bin.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-available/serve-cgi-bin.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/other-vhosts-access-log.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/other-vhosts-access-log.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/security.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/security.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/security.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/security.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/serve-cgi-bin.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/serve-cgi-bin.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/envvars b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/envvars
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/envvars
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/envvars
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.load b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.load
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.load
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/mods-available/ssl.load
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/ports.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/ports.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/ports.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/ports.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/000-default.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/000-default.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/000-default.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/000-default.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/default-ssl.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/default-ssl.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/default-ssl.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/default-ssl.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/encryption-example.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/encryption-example.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/encryption-example.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/encryption-example.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/letsencrypt.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/letsencrypt.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/letsencrypt.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-available/letsencrypt.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/000-default.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/000-default.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/000-default.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/encryption-example.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/encryption-example.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/encryption-example.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/encryption-example.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/letsencrypt.conf b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/letsencrypt.conf
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/letsencrypt.conf
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/apache2/sites-enabled/letsencrypt.conf
diff --git a/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/sites b/letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/sites
similarity index 100%
rename from letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/sites
rename to letsencrypt_apache/letsencrypt_apache/tests/testdata/debian_apache_2_4/two_vhost_80/sites
diff --git a/letsencrypt_apache/tests/util.py b/letsencrypt_apache/letsencrypt_apache/tests/util.py
similarity index 100%
rename from letsencrypt_apache/tests/util.py
rename to letsencrypt_apache/letsencrypt_apache/tests/util.py
diff --git a/letsencrypt_nginx/__init__.py b/letsencrypt_nginx/letsencrypt_nginx/__init__.py
similarity index 100%
rename from letsencrypt_nginx/__init__.py
rename to letsencrypt_nginx/letsencrypt_nginx/__init__.py
diff --git a/letsencrypt_nginx/configurator.py b/letsencrypt_nginx/letsencrypt_nginx/configurator.py
similarity index 100%
rename from letsencrypt_nginx/configurator.py
rename to letsencrypt_nginx/letsencrypt_nginx/configurator.py
diff --git a/letsencrypt_nginx/constants.py b/letsencrypt_nginx/letsencrypt_nginx/constants.py
similarity index 100%
rename from letsencrypt_nginx/constants.py
rename to letsencrypt_nginx/letsencrypt_nginx/constants.py
diff --git a/letsencrypt_nginx/dvsni.py b/letsencrypt_nginx/letsencrypt_nginx/dvsni.py
similarity index 100%
rename from letsencrypt_nginx/dvsni.py
rename to letsencrypt_nginx/letsencrypt_nginx/dvsni.py
diff --git a/letsencrypt_nginx/nginxparser.py b/letsencrypt_nginx/letsencrypt_nginx/nginxparser.py
similarity index 100%
rename from letsencrypt_nginx/nginxparser.py
rename to letsencrypt_nginx/letsencrypt_nginx/nginxparser.py
diff --git a/letsencrypt_nginx/obj.py b/letsencrypt_nginx/letsencrypt_nginx/obj.py
similarity index 100%
rename from letsencrypt_nginx/obj.py
rename to letsencrypt_nginx/letsencrypt_nginx/obj.py
diff --git a/letsencrypt_nginx/options-ssl-nginx.conf b/letsencrypt_nginx/letsencrypt_nginx/options-ssl-nginx.conf
similarity index 100%
rename from letsencrypt_nginx/options-ssl-nginx.conf
rename to letsencrypt_nginx/letsencrypt_nginx/options-ssl-nginx.conf
diff --git a/letsencrypt_nginx/parser.py b/letsencrypt_nginx/letsencrypt_nginx/parser.py
similarity index 100%
rename from letsencrypt_nginx/parser.py
rename to letsencrypt_nginx/letsencrypt_nginx/parser.py
diff --git a/letsencrypt_nginx/tests/__init__.py b/letsencrypt_nginx/letsencrypt_nginx/tests/__init__.py
similarity index 100%
rename from letsencrypt_nginx/tests/__init__.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/__init__.py
diff --git a/letsencrypt_nginx/tests/configurator_test.py b/letsencrypt_nginx/letsencrypt_nginx/tests/configurator_test.py
similarity index 100%
rename from letsencrypt_nginx/tests/configurator_test.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/configurator_test.py
diff --git a/letsencrypt_nginx/tests/dvsni_test.py b/letsencrypt_nginx/letsencrypt_nginx/tests/dvsni_test.py
similarity index 100%
rename from letsencrypt_nginx/tests/dvsni_test.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/dvsni_test.py
diff --git a/letsencrypt_nginx/tests/nginxparser_test.py b/letsencrypt_nginx/letsencrypt_nginx/tests/nginxparser_test.py
similarity index 100%
rename from letsencrypt_nginx/tests/nginxparser_test.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/nginxparser_test.py
diff --git a/letsencrypt_nginx/tests/obj_test.py b/letsencrypt_nginx/letsencrypt_nginx/tests/obj_test.py
similarity index 100%
rename from letsencrypt_nginx/tests/obj_test.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/obj_test.py
diff --git a/letsencrypt_nginx/tests/parser_test.py b/letsencrypt_nginx/letsencrypt_nginx/tests/parser_test.py
similarity index 100%
rename from letsencrypt_nginx/tests/parser_test.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/parser_test.py
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/edge_cases.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/edge_cases.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/edge_cases.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/edge_cases.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/foo.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/foo.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/foo.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/foo.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/mime.types b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/mime.types
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/mime.types
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/mime.types
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/nginx.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/nginx.new.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/server.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/server.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/server.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/server.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/default b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/default
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/default
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/default
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/example.com b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/example.com
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/example.com
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/sites-enabled/example.com
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1 b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
diff --git a/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf b/letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
similarity index 100%
rename from letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
rename to letsencrypt_nginx/letsencrypt_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
diff --git a/letsencrypt_nginx/tests/util.py b/letsencrypt_nginx/letsencrypt_nginx/tests/util.py
similarity index 100%
rename from letsencrypt_nginx/tests/util.py
rename to letsencrypt_nginx/letsencrypt_nginx/tests/util.py