diff --git a/certbot-apache/src/certbot_apache/_internal/__init__.py b/certbot/src/certbot/_internal/apache/__init__.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/__init__.py
rename to certbot/src/certbot/_internal/apache/__init__.py
diff --git a/certbot-apache/src/certbot_apache/_internal/apache_util.py b/certbot/src/certbot/_internal/apache/apache_util.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/apache_util.py
rename to certbot/src/certbot/_internal/apache/apache_util.py
diff --git a/certbot-apache/src/certbot_apache/_internal/apacheparser.py b/certbot/src/certbot/_internal/apache/apacheparser.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/apacheparser.py
rename to certbot/src/certbot/_internal/apache/apacheparser.py
diff --git a/certbot-apache/src/certbot_apache/_internal/assertions.py b/certbot/src/certbot/_internal/apache/assertions.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/assertions.py
rename to certbot/src/certbot/_internal/apache/assertions.py
diff --git a/certbot-apache/src/certbot_apache/_internal/augeas_lens/README b/certbot/src/certbot/_internal/apache/augeas_lens/README
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/augeas_lens/README
rename to certbot/src/certbot/_internal/apache/augeas_lens/README
diff --git a/certbot-apache/src/certbot_apache/_internal/augeas_lens/httpd.aug b/certbot/src/certbot/_internal/apache/augeas_lens/httpd.aug
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/augeas_lens/httpd.aug
rename to certbot/src/certbot/_internal/apache/augeas_lens/httpd.aug
diff --git a/certbot-apache/src/certbot_apache/_internal/augeasparser.py b/certbot/src/certbot/_internal/apache/augeasparser.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/augeasparser.py
rename to certbot/src/certbot/_internal/apache/augeasparser.py
diff --git a/certbot-apache/src/certbot_apache/_internal/configurator.py b/certbot/src/certbot/_internal/apache/configurator.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/configurator.py
rename to certbot/src/certbot/_internal/apache/configurator.py
diff --git a/certbot-apache/src/certbot_apache/_internal/constants.py b/certbot/src/certbot/_internal/apache/constants.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/constants.py
rename to certbot/src/certbot/_internal/apache/constants.py
diff --git a/certbot-apache/src/certbot_apache/_internal/display_ops.py b/certbot/src/certbot/_internal/apache/display_ops.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/display_ops.py
rename to certbot/src/certbot/_internal/apache/display_ops.py
diff --git a/certbot-apache/src/certbot_apache/_internal/dualparser.py b/certbot/src/certbot/_internal/apache/dualparser.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/dualparser.py
rename to certbot/src/certbot/_internal/apache/dualparser.py
diff --git a/certbot-apache/src/certbot_apache/_internal/entrypoint.py b/certbot/src/certbot/_internal/apache/entrypoint.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/entrypoint.py
rename to certbot/src/certbot/_internal/apache/entrypoint.py
diff --git a/certbot-apache/src/certbot_apache/_internal/http_01.py b/certbot/src/certbot/_internal/apache/http_01.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/http_01.py
rename to certbot/src/certbot/_internal/apache/http_01.py
diff --git a/certbot-apache/src/certbot_apache/_internal/interfaces.py b/certbot/src/certbot/_internal/apache/interfaces.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/interfaces.py
rename to certbot/src/certbot/_internal/apache/interfaces.py
diff --git a/certbot-apache/src/certbot_apache/_internal/obj.py b/certbot/src/certbot/_internal/apache/obj.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/obj.py
rename to certbot/src/certbot/_internal/apache/obj.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_alpine.py b/certbot/src/certbot/_internal/apache/override_alpine.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_alpine.py
rename to certbot/src/certbot/_internal/apache/override_alpine.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_arch.py b/certbot/src/certbot/_internal/apache/override_arch.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_arch.py
rename to certbot/src/certbot/_internal/apache/override_arch.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_centos.py b/certbot/src/certbot/_internal/apache/override_centos.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_centos.py
rename to certbot/src/certbot/_internal/apache/override_centos.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_darwin.py b/certbot/src/certbot/_internal/apache/override_darwin.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_darwin.py
rename to certbot/src/certbot/_internal/apache/override_darwin.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_debian.py b/certbot/src/certbot/_internal/apache/override_debian.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_debian.py
rename to certbot/src/certbot/_internal/apache/override_debian.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_fedora.py b/certbot/src/certbot/_internal/apache/override_fedora.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_fedora.py
rename to certbot/src/certbot/_internal/apache/override_fedora.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_gentoo.py b/certbot/src/certbot/_internal/apache/override_gentoo.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_gentoo.py
rename to certbot/src/certbot/_internal/apache/override_gentoo.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_suse.py b/certbot/src/certbot/_internal/apache/override_suse.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_suse.py
rename to certbot/src/certbot/_internal/apache/override_suse.py
diff --git a/certbot-apache/src/certbot_apache/_internal/override_void.py b/certbot/src/certbot/_internal/apache/override_void.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/override_void.py
rename to certbot/src/certbot/_internal/apache/override_void.py
diff --git a/certbot-apache/src/certbot_apache/_internal/parser.py b/certbot/src/certbot/_internal/apache/parser.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/parser.py
rename to certbot/src/certbot/_internal/apache/parser.py
diff --git a/certbot-apache/src/certbot_apache/_internal/parsernode_util.py b/certbot/src/certbot/_internal/apache/parsernode_util.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/parsernode_util.py
rename to certbot/src/certbot/_internal/apache/parsernode_util.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/__init__.py b/certbot/src/certbot/_internal/apache/tests/__init__.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/__init__.py
rename to certbot/src/certbot/_internal/apache/tests/__init__.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/NEEDED.txt
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/NEEDED.txt
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/NEEDED.txt
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/apache-conf-test
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/apache-conf-test
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/apache-conf-test-pebble.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/apache-conf-test-pebble.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/missing-double-quote-1724.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/multivhost-1093.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/multivhost-1093.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/multivhost-1093b.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/failing/multivhost-1093b.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/failing/multivhost-1093b.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/1626-1531.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/1626-1531.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/1626-1531.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/README.modules
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/README.modules
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/README.modules
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/anarcat-1531.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/anarcat-1531.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/anarcat-1531.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/comment-continuations-2050.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/comment-continuations-2050.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/comment-continuations-2050.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/escaped-space-arguments-2735.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example-1755.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-1755.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example-1755.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/example.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/example.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/finalize-1243.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/finalize-1243.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/finalize-1243.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/graphite-quote-1934.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143b.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143b.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143b.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143c.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143c.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143c.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143d.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/ipv6-1143d.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/ipv6-1143d.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/missing-quote-1724.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/missing-quote-1724.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/missing-quote-1724.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/modmacro-1385.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/modmacro-1385.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/modmacro-1385.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/owncloud-1264.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/owncloud-1264.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/owncloud-1264.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/rewrite-quote-1960.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/roundcube-1222.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/roundcube-1222.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/roundcube-1222.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/section-continuations-2525.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-continuations-2525.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/section-continuations-2525.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/section-empty-continuations-2731.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/section-empty-continuations-2731.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/semacode-1598.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/semacode-1598.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/semacode-1598.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
rename to certbot/src/certbot/_internal/apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/augeasnode_test.py b/certbot/src/certbot/_internal/apache/tests/augeasnode_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/augeasnode_test.py
rename to certbot/src/certbot/_internal/apache/tests/augeasnode_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py b/certbot/src/certbot/_internal/apache/tests/autohsts_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py
rename to certbot/src/certbot/_internal/apache/tests/autohsts_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py b/certbot/src/certbot/_internal/apache/tests/centos_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/centos_test.py
rename to certbot/src/certbot/_internal/apache/tests/centos_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py b/certbot/src/certbot/_internal/apache/tests/complex_parsing_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py
rename to certbot/src/certbot/_internal/apache/tests/complex_parsing_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py b/certbot/src/certbot/_internal/apache/tests/configurator_reverter_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py
rename to certbot/src/certbot/_internal/apache/tests/configurator_reverter_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/configurator_test.py b/certbot/src/certbot/_internal/apache/tests/configurator_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/configurator_test.py
rename to certbot/src/certbot/_internal/apache/tests/configurator_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/conftest.py b/certbot/src/certbot/_internal/apache/tests/conftest.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/conftest.py
rename to certbot/src/certbot/_internal/apache/tests/conftest.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py b/certbot/src/certbot/_internal/apache/tests/debian_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/debian_test.py
rename to certbot/src/certbot/_internal/apache/tests/debian_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/display_ops_test.py b/certbot/src/certbot/_internal/apache/tests/display_ops_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/display_ops_test.py
rename to certbot/src/certbot/_internal/apache/tests/display_ops_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/dualnode_test.py b/certbot/src/certbot/_internal/apache/tests/dualnode_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/dualnode_test.py
rename to certbot/src/certbot/_internal/apache/tests/dualnode_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/entrypoint_test.py b/certbot/src/certbot/_internal/apache/tests/entrypoint_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/entrypoint_test.py
rename to certbot/src/certbot/_internal/apache/tests/entrypoint_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py b/certbot/src/certbot/_internal/apache/tests/fedora_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py
rename to certbot/src/certbot/_internal/apache/tests/fedora_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py b/certbot/src/certbot/_internal/apache/tests/gentoo_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py
rename to certbot/src/certbot/_internal/apache/tests/gentoo_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py b/certbot/src/certbot/_internal/apache/tests/http_01_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py
rename to certbot/src/certbot/_internal/apache/tests/http_01_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/obj_test.py b/certbot/src/certbot/_internal/apache/tests/obj_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/obj_test.py
rename to certbot/src/certbot/_internal/apache/tests/obj_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py b/certbot/src/certbot/_internal/apache/tests/parser_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/parser_test.py
rename to certbot/src/certbot/_internal/apache/tests/parser_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/parsernode_configurator_test.py b/certbot/src/certbot/_internal/apache/tests/parsernode_configurator_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/parsernode_configurator_test.py
rename to certbot/src/certbot/_internal/apache/tests/parsernode_configurator_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/parsernode_test.py b/certbot/src/certbot/_internal/apache/tests/parsernode_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/parsernode_test.py
rename to certbot/src/certbot/_internal/apache/tests/parsernode_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/parsernode_util_test.py b/certbot/src/certbot/_internal/apache/tests/parsernode_util_test.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/parsernode_util_test.py
rename to certbot/src/certbot/_internal/apache/tests/parsernode_util_test.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/README
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/README
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/README
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/autoindex.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/centos.example.com.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/userdir.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.d/welcome.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-base.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-dav.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-lua.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-mpm.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-proxy.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/00-systemd.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf.modules.d/01-cgi.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf/httpd.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf/magic
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf/magic
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/httpd/conf/magic
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/sites
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sites
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/sites
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd b/certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/sysconfig/httpd
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/sysconfig/httpd
rename to certbot/src/certbot/_internal/apache/tests/testdata/centos7_apache/apache/sysconfig/httpd
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/apache2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/apache2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/apache2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf b/certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/conf-enabled/dummy.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/conf-enabled/dummy.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf b/certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/test_fnmatch.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_fnmatch.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/test_fnmatch.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf b/certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/test_variables.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/complex_parsing/test_variables.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/complex_parsing/test_variables.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/apache2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/bad_conf_file.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-available/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/envvars
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/authz_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/dav_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/rewrite.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-available/ssl.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/authz_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/mods-enabled/dav_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/ports.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/another_wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/old-and-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-available/wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/another_wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/old-and-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/apache2/sites-enabled/wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/sites
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/augeas_vhosts/sites
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/augeas_vhosts/sites
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/apache2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-available/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/envvars
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/mods-available/ssl.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/ports.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/000-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-available/default-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/apache2/sites-enabled/000-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/sites
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/default_vhost/sites
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/default_vhost/sites
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/apache2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/envvars
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/ports.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-available/multi-vhost.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multi_vhosts/apache2/sites-enabled/multi-vhost.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/apache2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/bad_conf_file.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-available/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/other-vhosts-access-log.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/security.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/envvars
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/authz_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/dav_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/rewrite.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-available/ssl.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/authz_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/mods-enabled/dav_svn.load
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/ports.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/000-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/certbot.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl-port-only.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/default-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttp.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/duplicatehttps.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/empty.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/mod_macro-example.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/no-directives.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/ocsp-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/000-default.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/certbot.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl-port-only.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/default-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttp.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/duplicatehttps.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/encryption-example.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/mod_macro-example.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/non-symlink.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/ocsp-ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-enabled/wildcard.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites b/certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
rename to certbot/src/certbot/_internal/apache/tests/testdata/debian_apache_2_4/multiple_vhosts/sites
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/httpd.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/httpd.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/httpd.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/magic
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/magic
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/magic
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_default_settings.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_error_documents.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_languages.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_autoindex.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_info.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_log_config.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_mime.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_status.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mod_userdir.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/00_mpm.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/10_mod_mem_cache.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/40_mod_ssl.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/41_mod_http2.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/45_mod_dav.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/modules.d/46_mod_ldap.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_vhost.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/default_vhost.include
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/gentoo.example.com.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2 b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/conf.d/apache2
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/conf.d/apache2
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites b/certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/sites
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/sites
rename to certbot/src/certbot/_internal/apache/tests/testdata/gentoo_apache/apache/sites
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/util.py b/certbot/src/certbot/_internal/apache/tests/util.py
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tests/util.py
rename to certbot/src/certbot/_internal/apache/tests/util.py
diff --git a/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf b/certbot/src/certbot/_internal/apache/tls_configs/current-options-ssl-apache.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf
rename to certbot/src/certbot/_internal/apache/tls_configs/current-options-ssl-apache.conf
diff --git a/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf b/certbot/src/certbot/_internal/apache/tls_configs/old-options-ssl-apache.conf
similarity index 100%
rename from certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf
rename to certbot/src/certbot/_internal/apache/tls_configs/old-options-ssl-apache.conf