diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8f7f9f..17ab3da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,14 +37,14 @@ images_build:
   extends: .build_docker_images
   variables:
     UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest
-    BADSSL_IMAGE_TAG: badssl-tsg-diagnose:latest
+    SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
     DNS_IMAGES_TAGE: dns-server-diagnose:latest
   script:
     - mkdir -p images
     - docker build -t $UNITTEST_IMAGE_TAG -f ./images_build/unittest_python/Dockerfile ./images_build/unittest_python/
     - docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
-    - docker build -t $BADSSL_IMAGE_TAG -f ./images_build/badssl.com/Dockerfile ./images_build/badssl.com/
-    - docker save $BADSSL_IMAGE_TAG  > images/badssl.tar
+    - docker build -t $SERVER_WEB_IMAGE_TAG -f ./images_build/server_web/Dockerfile ./images_build/server_web/
+    - docker save $SERVER_WEB_IMAGE_TAG  > images/server_web.tar
     - docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
     - docker save $DNS_IMAGES_TAGE > images/dns.tar
 
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
index b6e9162..b2fd94c 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.in
@@ -4,6 +4,6 @@ if [ $1 == 2 ]; then
     docker rmi -f unittest-tsg-diagnose
     docker rmi -f dns-server-diagnose
 fi
-docker load < /opt/tsg/tsg-diagnose/images/badssl.tar
+docker load < /opt/tsg/tsg-diagnose/images/server_web.tar
 docker load < /opt/tsg/tsg-diagnose/images/unittest.tar
 docker load < /opt/tsg/tsg-diagnose/images/dns.tar
diff --git a/images_build/badssl.com/.gitignore b/images_build/server_web/.gitignore
similarity index 100%
rename from images_build/badssl.com/.gitignore
rename to images_build/server_web/.gitignore
diff --git a/images_build/badssl.com/AUTHORS b/images_build/server_web/AUTHORS
similarity index 100%
rename from images_build/badssl.com/AUTHORS
rename to images_build/server_web/AUTHORS
diff --git a/images_build/badssl.com/Dockerfile b/images_build/server_web/Dockerfile
similarity index 100%
rename from images_build/badssl.com/Dockerfile
rename to images_build/server_web/Dockerfile
diff --git a/images_build/badssl.com/LICENSE b/images_build/server_web/LICENSE
similarity index 100%
rename from images_build/badssl.com/LICENSE
rename to images_build/server_web/LICENSE
diff --git a/images_build/badssl.com/Makefile b/images_build/server_web/Makefile
similarity index 100%
rename from images_build/badssl.com/Makefile
rename to images_build/server_web/Makefile
diff --git a/images_build/badssl.com/README.md b/images_build/server_web/README.md
similarity index 100%
rename from images_build/badssl.com/README.md
rename to images_build/server_web/README.md
diff --git a/images_build/badssl.com/_config.yml b/images_build/server_web/_config.yml
similarity index 100%
rename from images_build/badssl.com/_config.yml
rename to images_build/server_web/_config.yml
diff --git a/images_build/badssl.com/_layouts/page.html b/images_build/server_web/_layouts/page.html
similarity index 100%
rename from images_build/badssl.com/_layouts/page.html
rename to images_build/server_web/_layouts/page.html
diff --git a/images_build/badssl.com/_layouts/spoofed.html b/images_build/server_web/_layouts/spoofed.html
similarity index 100%
rename from images_build/badssl.com/_layouts/spoofed.html
rename to images_build/server_web/_layouts/spoofed.html
diff --git a/images_build/badssl.com/_plugins/environment_variable.rb b/images_build/server_web/_plugins/environment_variable.rb
similarity index 100%
rename from images_build/badssl.com/_plugins/environment_variable.rb
rename to images_build/server_web/_plugins/environment_variable.rb
diff --git a/images_build/badssl.com/badssl.png b/images_build/server_web/badssl.png
similarity index 100%
rename from images_build/badssl.com/badssl.png
rename to images_build/server_web/badssl.png
diff --git a/images_build/badssl.com/certs/.gitignore b/images_build/server_web/certs/.gitignore
similarity index 100%
rename from images_build/badssl.com/certs/.gitignore
rename to images_build/server_web/certs/.gitignore
diff --git a/images_build/badssl.com/certs/Makefile b/images_build/server_web/certs/Makefile
similarity index 100%
rename from images_build/badssl.com/certs/Makefile
rename to images_build/server_web/certs/Makefile
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/backup/wildcard-sha256-rsa2048-embeded-sct.crt b/images_build/server_web/certs/sets/prod/pregen/chain/backup/wildcard-sha256-rsa2048-embeded-sct.crt
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/backup/wildcard-sha256-rsa2048-embeded-sct.crt
rename to images_build/server_web/certs/sets/prod/pregen/chain/backup/wildcard-sha256-rsa2048-embeded-sct.crt
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/fallback.pem b/images_build/server_web/certs/sets/prod/pregen/chain/fallback.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/fallback.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/fallback.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/old/subdomain-sha384.pem b/images_build/server_web/certs/sets/prod/pregen/chain/old/subdomain-sha384.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/old/subdomain-sha384.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/old/subdomain-sha384.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/old/subdomain-sha512.pem b/images_build/server_web/certs/sets/prod/pregen/chain/old/subdomain-sha512.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/old/subdomain-sha512.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/old/subdomain-sha512.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/old/wildcard-incomplete-chain.pem b/images_build/server_web/certs/sets/prod/pregen/chain/old/wildcard-incomplete-chain.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/old/wildcard-incomplete-chain.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/old/wildcard-incomplete-chain.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/old/wildcard-main-old.pem b/images_build/server_web/certs/sets/prod/pregen/chain/old/wildcard-main-old.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/old/wildcard-main-old.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/old/wildcard-main-old.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-1000-sans.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-1000-sans.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-1000-sans.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-1000-sans.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-10000-sans.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-10000-sans.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-10000-sans.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-10000-sans.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-captive-portal.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-captive-portal.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-captive-portal.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-captive-portal.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-dsdtestprovider.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-dsdtestprovider.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-dsdtestprovider.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-dsdtestprovider.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-edellroot.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-edellroot.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-edellroot.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-edellroot.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-extended-validation.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-extended-validation.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-extended-validation.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-extended-validation.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-invalid-expected-sct.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-invalid-expected-sct.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-invalid-expected-sct.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-invalid-expected-sct.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-common-name.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-common-name.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-common-name.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-common-name.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-sct.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-sct.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-sct.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-sct.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-subject.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-subject.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-no-subject.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-no-subject.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-preloaded-expect-ct.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-preloaded-expect-ct.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-preloaded-expect-ct.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-preloaded-expect-ct.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-revoked.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-revoked.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-revoked.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-revoked.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-superfish.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-superfish.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-superfish.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-superfish.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-xn--n1aae7f7o.pem b/images_build/server_web/certs/sets/prod/pregen/chain/subdomain-xn--n1aae7f7o.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/subdomain-xn--n1aae7f7o.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/subdomain-xn--n1aae7f7o.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-ecc256.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-ecc256.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-ecc256.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-ecc256.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-ecc384.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-ecc384.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-ecc384.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-ecc384.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-expired.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-expired.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-expired.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-expired.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-incomplete-chain.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-incomplete-chain.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-incomplete-chain.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-incomplete-chain.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-preloaded-expect-ct.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-preloaded-expect-ct.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-preloaded-expect-ct.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-preloaded-expect-ct.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa2048.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa2048.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa2048.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa2048.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa4096.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa4096.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa4096.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa4096.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa8192.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa8192.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-rsa8192.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-rsa8192.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-self-signed.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-self-signed.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-self-signed.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-self-signed.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-2016.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-2016.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-2016.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-2016.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-2017.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-2017.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-2017.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-2017.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-intermediate.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-intermediate.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha1-intermediate.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha1-intermediate.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha384.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha384.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha384.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha384.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha512.pem b/images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha512.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/chain/wildcard-sha512.pem
rename to images_build/server_web/certs/sets/prod/pregen/chain/wildcard-sha512.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh16384.pem b/images_build/server_web/certs/sets/prod/pregen/dhparam/dh16384.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh16384.pem
rename to images_build/server_web/certs/sets/prod/pregen/dhparam/dh16384.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh2048.pem b/images_build/server_web/certs/sets/prod/pregen/dhparam/dh2048.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh2048.pem
rename to images_build/server_web/certs/sets/prod/pregen/dhparam/dh2048.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh32768.pem b/images_build/server_web/certs/sets/prod/pregen/dhparam/dh32768.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh32768.pem
rename to images_build/server_web/certs/sets/prod/pregen/dhparam/dh32768.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh4096.pem b/images_build/server_web/certs/sets/prod/pregen/dhparam/dh4096.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh4096.pem
rename to images_build/server_web/certs/sets/prod/pregen/dhparam/dh4096.pem
diff --git a/images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh8192.pem b/images_build/server_web/certs/sets/prod/pregen/dhparam/dh8192.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/prod/pregen/dhparam/dh8192.pem
rename to images_build/server_web/certs/sets/prod/pregen/dhparam/dh8192.pem
diff --git a/images_build/badssl.com/certs/sets/test/pregen/dhparam/dh2048.pem b/images_build/server_web/certs/sets/test/pregen/dhparam/dh2048.pem
similarity index 100%
rename from images_build/badssl.com/certs/sets/test/pregen/dhparam/dh2048.pem
rename to images_build/server_web/certs/sets/test/pregen/dhparam/dh2048.pem
diff --git a/images_build/badssl.com/certs/src/conf/ca-intermediate.conf b/images_build/server_web/certs/src/conf/ca-intermediate.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/ca-intermediate.conf
rename to images_build/server_web/certs/src/conf/ca-intermediate.conf
diff --git a/images_build/badssl.com/certs/src/conf/ca-root.conf b/images_build/server_web/certs/src/conf/ca-root.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/ca-root.conf
rename to images_build/server_web/certs/src/conf/ca-root.conf
diff --git a/images_build/badssl.com/certs/src/conf/ca-untrusted-root.conf b/images_build/server_web/certs/src/conf/ca-untrusted-root.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/ca-untrusted-root.conf
rename to images_build/server_web/certs/src/conf/ca-untrusted-root.conf
diff --git a/images_build/badssl.com/certs/src/conf/client-ca-root.conf b/images_build/server_web/certs/src/conf/client-ca-root.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/client-ca-root.conf
rename to images_build/server_web/certs/src/conf/client-ca-root.conf
diff --git a/images_build/badssl.com/certs/src/conf/client-ca-untrusted-root.conf b/images_build/server_web/certs/src/conf/client-ca-untrusted-root.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/client-ca-untrusted-root.conf
rename to images_build/server_web/certs/src/conf/client-ca-untrusted-root.conf
diff --git a/images_build/badssl.com/certs/src/conf/client.conf b/images_build/server_web/certs/src/conf/client.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/client.conf
rename to images_build/server_web/certs/src/conf/client.conf
diff --git a/images_build/badssl.com/certs/src/conf/fallback.conf b/images_build/server_web/certs/src/conf/fallback.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/fallback.conf
rename to images_build/server_web/certs/src/conf/fallback.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-1000-sans.conf b/images_build/server_web/certs/src/conf/subdomain-1000-sans.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-1000-sans.conf
rename to images_build/server_web/certs/src/conf/subdomain-1000-sans.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-10000-sans.conf b/images_build/server_web/certs/src/conf/subdomain-10000-sans.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-10000-sans.conf
rename to images_build/server_web/certs/src/conf/subdomain-10000-sans.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-captive-portal.conf b/images_build/server_web/certs/src/conf/subdomain-captive-portal.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-captive-portal.conf
rename to images_build/server_web/certs/src/conf/subdomain-captive-portal.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-dsdtestprovider.conf b/images_build/server_web/certs/src/conf/subdomain-dsdtestprovider.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-dsdtestprovider.conf
rename to images_build/server_web/certs/src/conf/subdomain-dsdtestprovider.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-edellroot.conf b/images_build/server_web/certs/src/conf/subdomain-edellroot.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-edellroot.conf
rename to images_build/server_web/certs/src/conf/subdomain-edellroot.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-extended-validation.conf b/images_build/server_web/certs/src/conf/subdomain-extended-validation.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-extended-validation.conf
rename to images_build/server_web/certs/src/conf/subdomain-extended-validation.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-invalid-expected-sct.conf b/images_build/server_web/certs/src/conf/subdomain-invalid-expected-sct.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-invalid-expected-sct.conf
rename to images_build/server_web/certs/src/conf/subdomain-invalid-expected-sct.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-mitm-software.conf b/images_build/server_web/certs/src/conf/subdomain-mitm-software.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-mitm-software.conf
rename to images_build/server_web/certs/src/conf/subdomain-mitm-software.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-no-common-name.conf b/images_build/server_web/certs/src/conf/subdomain-no-common-name.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-no-common-name.conf
rename to images_build/server_web/certs/src/conf/subdomain-no-common-name.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-no-san.conf b/images_build/server_web/certs/src/conf/subdomain-no-san.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-no-san.conf
rename to images_build/server_web/certs/src/conf/subdomain-no-san.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-no-sct.conf b/images_build/server_web/certs/src/conf/subdomain-no-sct.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-no-sct.conf
rename to images_build/server_web/certs/src/conf/subdomain-no-sct.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-no-subject.conf b/images_build/server_web/certs/src/conf/subdomain-no-subject.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-no-subject.conf
rename to images_build/server_web/certs/src/conf/subdomain-no-subject.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-preact-cli.conf b/images_build/server_web/certs/src/conf/subdomain-preact-cli.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-preact-cli.conf
rename to images_build/server_web/certs/src/conf/subdomain-preact-cli.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-preloaded-expect-ct.conf b/images_build/server_web/certs/src/conf/subdomain-preloaded-expect-ct.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-preloaded-expect-ct.conf
rename to images_build/server_web/certs/src/conf/subdomain-preloaded-expect-ct.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-revoked.conf b/images_build/server_web/certs/src/conf/subdomain-revoked.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-revoked.conf
rename to images_build/server_web/certs/src/conf/subdomain-revoked.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-superfish.conf b/images_build/server_web/certs/src/conf/subdomain-superfish.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-superfish.conf
rename to images_build/server_web/certs/src/conf/subdomain-superfish.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-webpack-dev-server.conf b/images_build/server_web/certs/src/conf/subdomain-webpack-dev-server.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-webpack-dev-server.conf
rename to images_build/server_web/certs/src/conf/subdomain-webpack-dev-server.conf
diff --git a/images_build/badssl.com/certs/src/conf/subdomain-xn--n1aae7f7o.conf b/images_build/server_web/certs/src/conf/subdomain-xn--n1aae7f7o.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/subdomain-xn--n1aae7f7o.conf
rename to images_build/server_web/certs/src/conf/subdomain-xn--n1aae7f7o.conf
diff --git a/images_build/badssl.com/certs/src/conf/wildcard.conf b/images_build/server_web/certs/src/conf/wildcard.conf
similarity index 100%
rename from images_build/badssl.com/certs/src/conf/wildcard.conf
rename to images_build/server_web/certs/src/conf/wildcard.conf
diff --git a/images_build/badssl.com/certs/src/crt/ca-dsdtestprovider.crt b/images_build/server_web/certs/src/crt/ca-dsdtestprovider.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-dsdtestprovider.crt
rename to images_build/server_web/certs/src/crt/ca-dsdtestprovider.crt
diff --git a/images_build/badssl.com/certs/src/crt/ca-edellroot.crt b/images_build/server_web/certs/src/crt/ca-edellroot.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-edellroot.crt
rename to images_build/server_web/certs/src/crt/ca-edellroot.crt
diff --git a/images_build/badssl.com/certs/src/crt/ca-mitm-software.crt b/images_build/server_web/certs/src/crt/ca-mitm-software.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-mitm-software.crt
rename to images_build/server_web/certs/src/crt/ca-mitm-software.crt
diff --git a/images_build/badssl.com/certs/src/crt/ca-preact-cli.crt b/images_build/server_web/certs/src/crt/ca-preact-cli.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-preact-cli.crt
rename to images_build/server_web/certs/src/crt/ca-preact-cli.crt
diff --git a/images_build/badssl.com/certs/src/crt/ca-superfish.crt b/images_build/server_web/certs/src/crt/ca-superfish.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-superfish.crt
rename to images_build/server_web/certs/src/crt/ca-superfish.crt
diff --git a/images_build/badssl.com/certs/src/crt/ca-webpack-dev-server.crt b/images_build/server_web/certs/src/crt/ca-webpack-dev-server.crt
similarity index 100%
rename from images_build/badssl.com/certs/src/crt/ca-webpack-dev-server.crt
rename to images_build/server_web/certs/src/crt/ca-webpack-dev-server.crt
diff --git a/images_build/badssl.com/certs/src/dhparam/dh-composite.pem b/images_build/server_web/certs/src/dhparam/dh-composite.pem
similarity index 100%
rename from images_build/badssl.com/certs/src/dhparam/dh-composite.pem
rename to images_build/server_web/certs/src/dhparam/dh-composite.pem
diff --git a/images_build/badssl.com/certs/src/dhparam/dh-small-subgroup.pem b/images_build/server_web/certs/src/dhparam/dh-small-subgroup.pem
similarity index 100%
rename from images_build/badssl.com/certs/src/dhparam/dh-small-subgroup.pem
rename to images_build/server_web/certs/src/dhparam/dh-small-subgroup.pem
diff --git a/images_build/badssl.com/certs/tool b/images_build/server_web/certs/tool
similarity index 100%
rename from images_build/badssl.com/certs/tool
rename to images_build/server_web/certs/tool
diff --git a/images_build/badssl.com/common/certs/.gitignore b/images_build/server_web/common/certs/.gitignore
similarity index 100%
rename from images_build/badssl.com/common/certs/.gitignore
rename to images_build/server_web/common/certs/.gitignore
diff --git a/images_build/badssl.com/common/common.conf b/images_build/server_web/common/common.conf
similarity index 100%
rename from images_build/badssl.com/common/common.conf
rename to images_build/server_web/common/common.conf
diff --git a/images_build/badssl.com/common/crossdomain.xml b/images_build/server_web/common/crossdomain.xml
similarity index 100%
rename from images_build/badssl.com/common/crossdomain.xml
rename to images_build/server_web/common/crossdomain.xml
diff --git a/images_build/badssl.com/common/icons/favicon-blue.ico b/images_build/server_web/common/icons/favicon-blue.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-blue.ico
rename to images_build/server_web/common/icons/favicon-blue.ico
diff --git a/images_build/badssl.com/common/icons/favicon-gray.ico b/images_build/server_web/common/icons/favicon-gray.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-gray.ico
rename to images_build/server_web/common/icons/favicon-gray.ico
diff --git a/images_build/badssl.com/common/icons/favicon-green.ico b/images_build/server_web/common/icons/favicon-green.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-green.ico
rename to images_build/server_web/common/icons/favicon-green.ico
diff --git a/images_build/badssl.com/common/icons/favicon-orange.ico b/images_build/server_web/common/icons/favicon-orange.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-orange.ico
rename to images_build/server_web/common/icons/favicon-orange.ico
diff --git a/images_build/badssl.com/common/icons/favicon-red.ico b/images_build/server_web/common/icons/favicon-red.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-red.ico
rename to images_build/server_web/common/icons/favicon-red.ico
diff --git a/images_build/badssl.com/common/icons/favicon-yellow.ico b/images_build/server_web/common/icons/favicon-yellow.ico
similarity index 100%
rename from images_build/badssl.com/common/icons/favicon-yellow.ico
rename to images_build/server_web/common/icons/favicon-yellow.ico
diff --git a/images_build/badssl.com/common/icons/icon-blue.png b/images_build/server_web/common/icons/icon-blue.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-blue.png
rename to images_build/server_web/common/icons/icon-blue.png
diff --git a/images_build/badssl.com/common/icons/icon-gray.png b/images_build/server_web/common/icons/icon-gray.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-gray.png
rename to images_build/server_web/common/icons/icon-gray.png
diff --git a/images_build/badssl.com/common/icons/icon-green.png b/images_build/server_web/common/icons/icon-green.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-green.png
rename to images_build/server_web/common/icons/icon-green.png
diff --git a/images_build/badssl.com/common/icons/icon-orange.png b/images_build/server_web/common/icons/icon-orange.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-orange.png
rename to images_build/server_web/common/icons/icon-orange.png
diff --git a/images_build/badssl.com/common/icons/icon-red.png b/images_build/server_web/common/icons/icon-red.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-red.png
rename to images_build/server_web/common/icons/icon-red.png
diff --git a/images_build/badssl.com/common/icons/icon-yellow.png b/images_build/server_web/common/icons/icon-yellow.png
similarity index 100%
rename from images_build/badssl.com/common/icons/icon-yellow.png
rename to images_build/server_web/common/icons/icon-yellow.png
diff --git a/images_build/badssl.com/common/input/credit-card/index.html b/images_build/server_web/common/input/credit-card/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/credit-card/index.html
rename to images_build/server_web/common/input/credit-card/index.html
diff --git a/images_build/badssl.com/common/input/dynamic-login/index.html b/images_build/server_web/common/input/dynamic-login/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/dynamic-login/index.html
rename to images_build/server_web/common/input/dynamic-login/index.html
diff --git a/images_build/badssl.com/common/input/dynamic-login/submit/index.html b/images_build/server_web/common/input/dynamic-login/submit/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/dynamic-login/submit/index.html
rename to images_build/server_web/common/input/dynamic-login/submit/index.html
diff --git a/images_build/badssl.com/common/input/login/index.html b/images_build/server_web/common/input/login/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/login/index.html
rename to images_build/server_web/common/input/login/index.html
diff --git a/images_build/badssl.com/common/input/login/submit/index.html b/images_build/server_web/common/input/login/submit/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/login/submit/index.html
rename to images_build/server_web/common/input/login/submit/index.html
diff --git a/images_build/badssl.com/common/input/password/index.html b/images_build/server_web/common/input/password/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/password/index.html
rename to images_build/server_web/common/input/password/index.html
diff --git a/images_build/badssl.com/common/input/textarea/index.html b/images_build/server_web/common/input/textarea/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/textarea/index.html
rename to images_build/server_web/common/input/textarea/index.html
diff --git a/images_build/badssl.com/common/input/web-payment/index.html b/images_build/server_web/common/input/web-payment/index.html
similarity index 100%
rename from images_build/badssl.com/common/input/web-payment/index.html
rename to images_build/server_web/common/input/web-payment/index.html
diff --git a/images_build/badssl.com/common/input/web-payment/index.js b/images_build/server_web/common/input/web-payment/index.js
similarity index 100%
rename from images_build/badssl.com/common/input/web-payment/index.js
rename to images_build/server_web/common/input/web-payment/index.js
diff --git a/images_build/badssl.com/common/mixed/css/index.html b/images_build/server_web/common/mixed/css/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/css/index.html
rename to images_build/server_web/common/mixed/css/index.html
diff --git a/images_build/badssl.com/common/mixed/font/index.html b/images_build/server_web/common/mixed/font/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/font/index.html
rename to images_build/server_web/common/mixed/font/index.html
diff --git a/images_build/badssl.com/common/mixed/form/index.html b/images_build/server_web/common/mixed/form/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/form/index.html
rename to images_build/server_web/common/mixed/form/index.html
diff --git a/images_build/badssl.com/common/mixed/iframe/index.html b/images_build/server_web/common/mixed/iframe/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/iframe/index.html
rename to images_build/server_web/common/mixed/iframe/index.html
diff --git a/images_build/badssl.com/common/mixed/image/index.html b/images_build/server_web/common/mixed/image/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/image/index.html
rename to images_build/server_web/common/mixed/image/index.html
diff --git a/images_build/badssl.com/common/mixed/nonexistent-image/index.html b/images_build/server_web/common/mixed/nonexistent-image/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/nonexistent-image/index.html
rename to images_build/server_web/common/mixed/nonexistent-image/index.html
diff --git a/images_build/badssl.com/common/mixed/password/index.html b/images_build/server_web/common/mixed/password/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/password/index.html
rename to images_build/server_web/common/mixed/password/index.html
diff --git a/images_build/badssl.com/common/mixed/script/index.html b/images_build/server_web/common/mixed/script/index.html
similarity index 100%
rename from images_build/badssl.com/common/mixed/script/index.html
rename to images_build/server_web/common/mixed/script/index.html
diff --git a/images_build/badssl.com/common/robots.txt b/images_build/server_web/common/robots.txt
similarity index 100%
rename from images_build/badssl.com/common/robots.txt
rename to images_build/server_web/common/robots.txt
diff --git a/images_build/badssl.com/common/style.css b/images_build/server_web/common/style.css
similarity index 100%
rename from images_build/badssl.com/common/style.css
rename to images_build/server_web/common/style.css
diff --git a/images_build/badssl.com/common/test/basic-auth/index.html b/images_build/server_web/common/test/basic-auth/index.html
similarity index 100%
rename from images_build/badssl.com/common/test/basic-auth/index.html
rename to images_build/server_web/common/test/basic-auth/index.html
diff --git a/images_build/badssl.com/common/test/canceled-image/index.html b/images_build/server_web/common/test/canceled-image/index.html
similarity index 100%
rename from images_build/badssl.com/common/test/canceled-image/index.html
rename to images_build/server_web/common/test/canceled-image/index.html
diff --git a/images_build/badssl.com/common/test/cors/cors.json b/images_build/server_web/common/test/cors/cors.json
similarity index 100%
rename from images_build/badssl.com/common/test/cors/cors.json
rename to images_build/server_web/common/test/cors/cors.json
diff --git a/images_build/badssl.com/common/test/dashboard/small-image.png b/images_build/server_web/common/test/dashboard/small-image.png
similarity index 100%
rename from images_build/badssl.com/common/test/dashboard/small-image.png
rename to images_build/server_web/common/test/dashboard/small-image.png
diff --git a/images_build/badssl.com/common/test/dashboard/small-text-file.txt b/images_build/server_web/common/test/dashboard/small-text-file.txt
similarity index 100%
rename from images_build/badssl.com/common/test/dashboard/small-text-file.txt
rename to images_build/server_web/common/test/dashboard/small-text-file.txt
diff --git a/images_build/badssl.com/common/test/imported.js b/images_build/server_web/common/test/imported.js
similarity index 100%
rename from images_build/badssl.com/common/test/imported.js
rename to images_build/server_web/common/test/imported.js
diff --git a/images_build/badssl.com/common/test/theme-color/index.html b/images_build/server_web/common/test/theme-color/index.html
similarity index 100%
rename from images_build/badssl.com/common/test/theme-color/index.html
rename to images_build/server_web/common/test/theme-color/index.html
diff --git a/images_build/badssl.com/domains-local-only/cert/md5.conf b/images_build/server_web/domains-local-only/cert/md5.conf
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/md5.conf
rename to images_build/server_web/domains-local-only/cert/md5.conf
diff --git a/images_build/badssl.com/domains-local-only/cert/md5/index.html b/images_build/server_web/domains-local-only/cert/md5/index.html
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/md5/index.html
rename to images_build/server_web/domains-local-only/cert/md5/index.html
diff --git a/images_build/badssl.com/domains-local-only/cert/no-san.conf b/images_build/server_web/domains-local-only/cert/no-san.conf
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/no-san.conf
rename to images_build/server_web/domains-local-only/cert/no-san.conf
diff --git a/images_build/badssl.com/domains-local-only/cert/no-san/index.html b/images_build/server_web/domains-local-only/cert/no-san/index.html
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/no-san/index.html
rename to images_build/server_web/domains-local-only/cert/no-san/index.html
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa1024.conf b/images_build/server_web/domains-local-only/cert/rsa1024.conf
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa1024.conf
rename to images_build/server_web/domains-local-only/cert/rsa1024.conf
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa1024/index.html b/images_build/server_web/domains-local-only/cert/rsa1024/index.html
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa1024/index.html
rename to images_build/server_web/domains-local-only/cert/rsa1024/index.html
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa3072.conf b/images_build/server_web/domains-local-only/cert/rsa3072.conf
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa3072.conf
rename to images_build/server_web/domains-local-only/cert/rsa3072.conf
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa3072/index.html b/images_build/server_web/domains-local-only/cert/rsa3072/index.html
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa3072/index.html
rename to images_build/server_web/domains-local-only/cert/rsa3072/index.html
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa512.conf b/images_build/server_web/domains-local-only/cert/rsa512.conf
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa512.conf
rename to images_build/server_web/domains-local-only/cert/rsa512.conf
diff --git a/images_build/badssl.com/domains-local-only/cert/rsa512/index.html b/images_build/server_web/domains-local-only/cert/rsa512/index.html
similarity index 100%
rename from images_build/badssl.com/domains-local-only/cert/rsa512/index.html
rename to images_build/server_web/domains-local-only/cert/rsa512/index.html
diff --git a/images_build/badssl.com/domains/cert/1000-sans.conf b/images_build/server_web/domains/cert/1000-sans.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/1000-sans.conf
rename to images_build/server_web/domains/cert/1000-sans.conf
diff --git a/images_build/badssl.com/domains/cert/1000-sans/index.html b/images_build/server_web/domains/cert/1000-sans/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/1000-sans/index.html
rename to images_build/server_web/domains/cert/1000-sans/index.html
diff --git a/images_build/badssl.com/domains/cert/10000-sans.conf b/images_build/server_web/domains/cert/10000-sans.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/10000-sans.conf
rename to images_build/server_web/domains/cert/10000-sans.conf
diff --git a/images_build/badssl.com/domains/cert/10000-sans/index.html b/images_build/server_web/domains/cert/10000-sans/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/10000-sans/index.html
rename to images_build/server_web/domains/cert/10000-sans/index.html
diff --git a/images_build/badssl.com/domains/cert/captive-portal.conf b/images_build/server_web/domains/cert/captive-portal.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/captive-portal.conf
rename to images_build/server_web/domains/cert/captive-portal.conf
diff --git a/images_build/badssl.com/domains/cert/captive-portal/index.html b/images_build/server_web/domains/cert/captive-portal/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/captive-portal/index.html
rename to images_build/server_web/domains/cert/captive-portal/index.html
diff --git a/images_build/badssl.com/domains/cert/ecc256.conf b/images_build/server_web/domains/cert/ecc256.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/ecc256.conf
rename to images_build/server_web/domains/cert/ecc256.conf
diff --git a/images_build/badssl.com/domains/cert/ecc256/index.html b/images_build/server_web/domains/cert/ecc256/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/ecc256/index.html
rename to images_build/server_web/domains/cert/ecc256/index.html
diff --git a/images_build/badssl.com/domains/cert/ecc384.conf b/images_build/server_web/domains/cert/ecc384.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/ecc384.conf
rename to images_build/server_web/domains/cert/ecc384.conf
diff --git a/images_build/badssl.com/domains/cert/ecc384/index.html b/images_build/server_web/domains/cert/ecc384/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/ecc384/index.html
rename to images_build/server_web/domains/cert/ecc384/index.html
diff --git a/images_build/badssl.com/domains/cert/expired.conf b/images_build/server_web/domains/cert/expired.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/expired.conf
rename to images_build/server_web/domains/cert/expired.conf
diff --git a/images_build/badssl.com/domains/cert/expired/index.html b/images_build/server_web/domains/cert/expired/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/expired/index.html
rename to images_build/server_web/domains/cert/expired/index.html
diff --git a/images_build/badssl.com/domains/cert/extended-validation.conf b/images_build/server_web/domains/cert/extended-validation.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/extended-validation.conf
rename to images_build/server_web/domains/cert/extended-validation.conf
diff --git a/images_build/badssl.com/domains/cert/extended-validation/index.html b/images_build/server_web/domains/cert/extended-validation/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/extended-validation/index.html
rename to images_build/server_web/domains/cert/extended-validation/index.html
diff --git a/images_build/badssl.com/domains/cert/incomplete-chain.conf b/images_build/server_web/domains/cert/incomplete-chain.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/incomplete-chain.conf
rename to images_build/server_web/domains/cert/incomplete-chain.conf
diff --git a/images_build/badssl.com/domains/cert/incomplete-chain/index.html b/images_build/server_web/domains/cert/incomplete-chain/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/incomplete-chain/index.html
rename to images_build/server_web/domains/cert/incomplete-chain/index.html
diff --git a/images_build/badssl.com/domains/cert/invalid-expected-sct.conf b/images_build/server_web/domains/cert/invalid-expected-sct.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/invalid-expected-sct.conf
rename to images_build/server_web/domains/cert/invalid-expected-sct.conf
diff --git a/images_build/badssl.com/domains/cert/invalid-expected-sct/index.html b/images_build/server_web/domains/cert/invalid-expected-sct/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/invalid-expected-sct/index.html
rename to images_build/server_web/domains/cert/invalid-expected-sct/index.html
diff --git a/images_build/badssl.com/domains/cert/no-common-name.conf b/images_build/server_web/domains/cert/no-common-name.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-common-name.conf
rename to images_build/server_web/domains/cert/no-common-name.conf
diff --git a/images_build/badssl.com/domains/cert/no-common-name/index.html b/images_build/server_web/domains/cert/no-common-name/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-common-name/index.html
rename to images_build/server_web/domains/cert/no-common-name/index.html
diff --git a/images_build/badssl.com/domains/cert/no-sct.conf b/images_build/server_web/domains/cert/no-sct.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-sct.conf
rename to images_build/server_web/domains/cert/no-sct.conf
diff --git a/images_build/badssl.com/domains/cert/no-sct/index.html b/images_build/server_web/domains/cert/no-sct/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-sct/index.html
rename to images_build/server_web/domains/cert/no-sct/index.html
diff --git a/images_build/badssl.com/domains/cert/no-subject.conf b/images_build/server_web/domains/cert/no-subject.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-subject.conf
rename to images_build/server_web/domains/cert/no-subject.conf
diff --git a/images_build/badssl.com/domains/cert/no-subject/index.html b/images_build/server_web/domains/cert/no-subject/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/no-subject/index.html
rename to images_build/server_web/domains/cert/no-subject/index.html
diff --git a/images_build/badssl.com/domains/cert/pinning-test.conf b/images_build/server_web/domains/cert/pinning-test.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/pinning-test.conf
rename to images_build/server_web/domains/cert/pinning-test.conf
diff --git a/images_build/badssl.com/domains/cert/pinning-test/index.html b/images_build/server_web/domains/cert/pinning-test/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/pinning-test/index.html
rename to images_build/server_web/domains/cert/pinning-test/index.html
diff --git a/images_build/badssl.com/domains/cert/preloaded-expect-ct.conf b/images_build/server_web/domains/cert/preloaded-expect-ct.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/preloaded-expect-ct.conf
rename to images_build/server_web/domains/cert/preloaded-expect-ct.conf
diff --git a/images_build/badssl.com/domains/cert/preloaded-expect-ct/index.html b/images_build/server_web/domains/cert/preloaded-expect-ct/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/preloaded-expect-ct/index.html
rename to images_build/server_web/domains/cert/preloaded-expect-ct/index.html
diff --git a/images_build/badssl.com/domains/cert/revoked.conf b/images_build/server_web/domains/cert/revoked.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/revoked.conf
rename to images_build/server_web/domains/cert/revoked.conf
diff --git a/images_build/badssl.com/domains/cert/revoked/index.html b/images_build/server_web/domains/cert/revoked/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/revoked/index.html
rename to images_build/server_web/domains/cert/revoked/index.html
diff --git a/images_build/badssl.com/domains/cert/rsa2048.conf b/images_build/server_web/domains/cert/rsa2048.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa2048.conf
rename to images_build/server_web/domains/cert/rsa2048.conf
diff --git a/images_build/badssl.com/domains/cert/rsa2048/index.html b/images_build/server_web/domains/cert/rsa2048/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa2048/index.html
rename to images_build/server_web/domains/cert/rsa2048/index.html
diff --git a/images_build/badssl.com/domains/cert/rsa4096.conf b/images_build/server_web/domains/cert/rsa4096.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa4096.conf
rename to images_build/server_web/domains/cert/rsa4096.conf
diff --git a/images_build/badssl.com/domains/cert/rsa4096/index.html b/images_build/server_web/domains/cert/rsa4096/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa4096/index.html
rename to images_build/server_web/domains/cert/rsa4096/index.html
diff --git a/images_build/badssl.com/domains/cert/rsa8192.conf b/images_build/server_web/domains/cert/rsa8192.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa8192.conf
rename to images_build/server_web/domains/cert/rsa8192.conf
diff --git a/images_build/badssl.com/domains/cert/rsa8192/index.html b/images_build/server_web/domains/cert/rsa8192/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/rsa8192/index.html
rename to images_build/server_web/domains/cert/rsa8192/index.html
diff --git a/images_build/badssl.com/domains/cert/self-signed.conf b/images_build/server_web/domains/cert/self-signed.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/self-signed.conf
rename to images_build/server_web/domains/cert/self-signed.conf
diff --git a/images_build/badssl.com/domains/cert/self-signed/index.html b/images_build/server_web/domains/cert/self-signed/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/self-signed/index.html
rename to images_build/server_web/domains/cert/self-signed/index.html
diff --git a/images_build/badssl.com/domains/cert/self-signed/test/imported.js b/images_build/server_web/domains/cert/self-signed/test/imported.js
similarity index 100%
rename from images_build/badssl.com/domains/cert/self-signed/test/imported.js
rename to images_build/server_web/domains/cert/self-signed/test/imported.js
diff --git a/images_build/badssl.com/domains/cert/sha1-2016.conf b/images_build/server_web/domains/cert/sha1-2016.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-2016.conf
rename to images_build/server_web/domains/cert/sha1-2016.conf
diff --git a/images_build/badssl.com/domains/cert/sha1-2016/index.html b/images_build/server_web/domains/cert/sha1-2016/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-2016/index.html
rename to images_build/server_web/domains/cert/sha1-2016/index.html
diff --git a/images_build/badssl.com/domains/cert/sha1-2017.conf b/images_build/server_web/domains/cert/sha1-2017.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-2017.conf
rename to images_build/server_web/domains/cert/sha1-2017.conf
diff --git a/images_build/badssl.com/domains/cert/sha1-2017/index.html b/images_build/server_web/domains/cert/sha1-2017/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-2017/index.html
rename to images_build/server_web/domains/cert/sha1-2017/index.html
diff --git a/images_build/badssl.com/domains/cert/sha1-intermediate.conf b/images_build/server_web/domains/cert/sha1-intermediate.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-intermediate.conf
rename to images_build/server_web/domains/cert/sha1-intermediate.conf
diff --git a/images_build/badssl.com/domains/cert/sha1-intermediate/index.html b/images_build/server_web/domains/cert/sha1-intermediate/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1-intermediate/index.html
rename to images_build/server_web/domains/cert/sha1-intermediate/index.html
diff --git a/images_build/badssl.com/domains/cert/sha1.conf b/images_build/server_web/domains/cert/sha1.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1.conf
rename to images_build/server_web/domains/cert/sha1.conf
diff --git a/images_build/badssl.com/domains/cert/sha1/index.html b/images_build/server_web/domains/cert/sha1/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha1/index.html
rename to images_build/server_web/domains/cert/sha1/index.html
diff --git a/images_build/badssl.com/domains/cert/sha256.conf b/images_build/server_web/domains/cert/sha256.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha256.conf
rename to images_build/server_web/domains/cert/sha256.conf
diff --git a/images_build/badssl.com/domains/cert/sha256/index.html b/images_build/server_web/domains/cert/sha256/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha256/index.html
rename to images_build/server_web/domains/cert/sha256/index.html
diff --git a/images_build/badssl.com/domains/cert/sha384.conf b/images_build/server_web/domains/cert/sha384.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha384.conf
rename to images_build/server_web/domains/cert/sha384.conf
diff --git a/images_build/badssl.com/domains/cert/sha384/index.html b/images_build/server_web/domains/cert/sha384/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha384/index.html
rename to images_build/server_web/domains/cert/sha384/index.html
diff --git a/images_build/badssl.com/domains/cert/sha512.conf b/images_build/server_web/domains/cert/sha512.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha512.conf
rename to images_build/server_web/domains/cert/sha512.conf
diff --git a/images_build/badssl.com/domains/cert/sha512/index.html b/images_build/server_web/domains/cert/sha512/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/sha512/index.html
rename to images_build/server_web/domains/cert/sha512/index.html
diff --git a/images_build/badssl.com/domains/cert/spoof.conf b/images_build/server_web/domains/cert/spoof.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/spoof.conf
rename to images_build/server_web/domains/cert/spoof.conf
diff --git a/images_build/badssl.com/domains/cert/untrusted-root.conf b/images_build/server_web/domains/cert/untrusted-root.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/untrusted-root.conf
rename to images_build/server_web/domains/cert/untrusted-root.conf
diff --git a/images_build/badssl.com/domains/cert/untrusted-root/index.html b/images_build/server_web/domains/cert/untrusted-root/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/untrusted-root/index.html
rename to images_build/server_web/domains/cert/untrusted-root/index.html
diff --git a/images_build/badssl.com/domains/cert/wrong.host.conf b/images_build/server_web/domains/cert/wrong.host.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/wrong.host.conf
rename to images_build/server_web/domains/cert/wrong.host.conf
diff --git a/images_build/badssl.com/domains/cert/wrong.host/index.html b/images_build/server_web/domains/cert/wrong.host/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/wrong.host/index.html
rename to images_build/server_web/domains/cert/wrong.host/index.html
diff --git a/images_build/badssl.com/domains/cert/xn--n1aae7f7o.conf b/images_build/server_web/domains/cert/xn--n1aae7f7o.conf
similarity index 100%
rename from images_build/badssl.com/domains/cert/xn--n1aae7f7o.conf
rename to images_build/server_web/domains/cert/xn--n1aae7f7o.conf
diff --git a/images_build/badssl.com/domains/cert/xn--n1aae7f7o/index.html b/images_build/server_web/domains/cert/xn--n1aae7f7o/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cert/xn--n1aae7f7o/index.html
rename to images_build/server_web/domains/cert/xn--n1aae7f7o/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/3des.conf b/images_build/server_web/domains/cipher-suite/3des.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/3des.conf
rename to images_build/server_web/domains/cipher-suite/3des.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/3des/index.html b/images_build/server_web/domains/cipher-suite/3des/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/3des/index.html
rename to images_build/server_web/domains/cipher-suite/3des/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/cbc.conf b/images_build/server_web/domains/cipher-suite/cbc.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/cbc.conf
rename to images_build/server_web/domains/cipher-suite/cbc.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/cbc/index.html b/images_build/server_web/domains/cipher-suite/cbc/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/cbc/index.html
rename to images_build/server_web/domains/cipher-suite/cbc/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-intermediate.conf b/images_build/server_web/domains/cipher-suite/mozilla-intermediate.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-intermediate.conf
rename to images_build/server_web/domains/cipher-suite/mozilla-intermediate.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-intermediate/index.html b/images_build/server_web/domains/cipher-suite/mozilla-intermediate/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-intermediate/index.html
rename to images_build/server_web/domains/cipher-suite/mozilla-intermediate/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-modern.conf b/images_build/server_web/domains/cipher-suite/mozilla-modern.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-modern.conf
rename to images_build/server_web/domains/cipher-suite/mozilla-modern.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-modern/index.html b/images_build/server_web/domains/cipher-suite/mozilla-modern/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-modern/index.html
rename to images_build/server_web/domains/cipher-suite/mozilla-modern/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-old.conf b/images_build/server_web/domains/cipher-suite/mozilla-old.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-old.conf
rename to images_build/server_web/domains/cipher-suite/mozilla-old.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/mozilla-old/index.html b/images_build/server_web/domains/cipher-suite/mozilla-old/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/mozilla-old/index.html
rename to images_build/server_web/domains/cipher-suite/mozilla-old/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/null.conf b/images_build/server_web/domains/cipher-suite/null.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/null.conf
rename to images_build/server_web/domains/cipher-suite/null.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/null/index.html b/images_build/server_web/domains/cipher-suite/null/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/null/index.html
rename to images_build/server_web/domains/cipher-suite/null/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/rc4-md5.conf b/images_build/server_web/domains/cipher-suite/rc4-md5.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/rc4-md5.conf
rename to images_build/server_web/domains/cipher-suite/rc4-md5.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/rc4-md5/index.html b/images_build/server_web/domains/cipher-suite/rc4-md5/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/rc4-md5/index.html
rename to images_build/server_web/domains/cipher-suite/rc4-md5/index.html
diff --git a/images_build/badssl.com/domains/cipher-suite/rc4.conf b/images_build/server_web/domains/cipher-suite/rc4.conf
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/rc4.conf
rename to images_build/server_web/domains/cipher-suite/rc4.conf
diff --git a/images_build/badssl.com/domains/cipher-suite/rc4/index.html b/images_build/server_web/domains/cipher-suite/rc4/index.html
similarity index 100%
rename from images_build/badssl.com/domains/cipher-suite/rc4/index.html
rename to images_build/server_web/domains/cipher-suite/rc4/index.html
diff --git a/images_build/badssl.com/domains/client/client-cert-missing.conf b/images_build/server_web/domains/client/client-cert-missing.conf
similarity index 100%
rename from images_build/badssl.com/domains/client/client-cert-missing.conf
rename to images_build/server_web/domains/client/client-cert-missing.conf
diff --git a/images_build/badssl.com/domains/client/client-cert-missing/index.html b/images_build/server_web/domains/client/client-cert-missing/index.html
similarity index 100%
rename from images_build/badssl.com/domains/client/client-cert-missing/index.html
rename to images_build/server_web/domains/client/client-cert-missing/index.html
diff --git a/images_build/badssl.com/domains/client/client.conf b/images_build/server_web/domains/client/client.conf
similarity index 100%
rename from images_build/badssl.com/domains/client/client.conf
rename to images_build/server_web/domains/client/client.conf
diff --git a/images_build/badssl.com/domains/client/client/index.html b/images_build/server_web/domains/client/client/index.html
similarity index 100%
rename from images_build/badssl.com/domains/client/client/index.html
rename to images_build/server_web/domains/client/client/index.html
diff --git a/images_build/badssl.com/domains/http/http-credit-card.conf b/images_build/server_web/domains/http/http-credit-card.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http-credit-card.conf
rename to images_build/server_web/domains/http/http-credit-card.conf
diff --git a/images_build/badssl.com/domains/http/http-credit-card/index.html b/images_build/server_web/domains/http/http-credit-card/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-credit-card/index.html
rename to images_build/server_web/domains/http/http-credit-card/index.html
diff --git a/images_build/badssl.com/domains/http/http-dynamic-login.conf b/images_build/server_web/domains/http/http-dynamic-login.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http-dynamic-login.conf
rename to images_build/server_web/domains/http/http-dynamic-login.conf
diff --git a/images_build/badssl.com/domains/http/http-dynamic-login/index.html b/images_build/server_web/domains/http/http-dynamic-login/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-dynamic-login/index.html
rename to images_build/server_web/domains/http/http-dynamic-login/index.html
diff --git a/images_build/badssl.com/domains/http/http-dynamic-login/submit/index.html b/images_build/server_web/domains/http/http-dynamic-login/submit/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-dynamic-login/submit/index.html
rename to images_build/server_web/domains/http/http-dynamic-login/submit/index.html
diff --git a/images_build/badssl.com/domains/http/http-login.conf b/images_build/server_web/domains/http/http-login.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http-login.conf
rename to images_build/server_web/domains/http/http-login.conf
diff --git a/images_build/badssl.com/domains/http/http-login/index.html b/images_build/server_web/domains/http/http-login/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-login/index.html
rename to images_build/server_web/domains/http/http-login/index.html
diff --git a/images_build/badssl.com/domains/http/http-login/submit/index.html b/images_build/server_web/domains/http/http-login/submit/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-login/submit/index.html
rename to images_build/server_web/domains/http/http-login/submit/index.html
diff --git a/images_build/badssl.com/domains/http/http-password.conf b/images_build/server_web/domains/http/http-password.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http-password.conf
rename to images_build/server_web/domains/http/http-password.conf
diff --git a/images_build/badssl.com/domains/http/http-password/index.html b/images_build/server_web/domains/http/http-password/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-password/index.html
rename to images_build/server_web/domains/http/http-password/index.html
diff --git a/images_build/badssl.com/domains/http/http-textarea.conf b/images_build/server_web/domains/http/http-textarea.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http-textarea.conf
rename to images_build/server_web/domains/http/http-textarea.conf
diff --git a/images_build/badssl.com/domains/http/http-textarea/index.html b/images_build/server_web/domains/http/http-textarea/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http-textarea/index.html
rename to images_build/server_web/domains/http/http-textarea/index.html
diff --git a/images_build/badssl.com/domains/http/http.conf b/images_build/server_web/domains/http/http.conf
similarity index 100%
rename from images_build/badssl.com/domains/http/http.conf
rename to images_build/server_web/domains/http/http.conf
diff --git a/images_build/badssl.com/domains/http/http/index.html b/images_build/server_web/domains/http/http/index.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http/index.html
rename to images_build/server_web/domains/http/http/index.html
diff --git a/images_build/badssl.com/domains/http/http/resources/font.ttf b/images_build/server_web/domains/http/http/resources/font.ttf
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/font.ttf
rename to images_build/server_web/domains/http/http/resources/font.ttf
diff --git a/images_build/badssl.com/domains/http/http/resources/form-submitted.html b/images_build/server_web/domains/http/http/resources/form-submitted.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/form-submitted.html
rename to images_build/server_web/domains/http/http/resources/form-submitted.html
diff --git a/images_build/badssl.com/domains/http/http/resources/iframe.html b/images_build/server_web/domains/http/http/resources/iframe.html
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/iframe.html
rename to images_build/server_web/domains/http/http/resources/iframe.html
diff --git a/images_build/badssl.com/domains/http/http/resources/image.jpg b/images_build/server_web/domains/http/http/resources/image.jpg
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/image.jpg
rename to images_build/server_web/domains/http/http/resources/image.jpg
diff --git a/images_build/badssl.com/domains/http/http/resources/script.js b/images_build/server_web/domains/http/http/resources/script.js
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/script.js
rename to images_build/server_web/domains/http/http/resources/script.js
diff --git a/images_build/badssl.com/domains/http/http/resources/stylesheet.css b/images_build/server_web/domains/http/http/resources/stylesheet.css
similarity index 100%
rename from images_build/badssl.com/domains/http/http/resources/stylesheet.css
rename to images_build/server_web/domains/http/http/resources/stylesheet.css
diff --git a/images_build/badssl.com/domains/key-exchange/dh-composite.conf b/images_build/server_web/domains/key-exchange/dh-composite.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh-composite.conf
rename to images_build/server_web/domains/key-exchange/dh-composite.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh-composite/index.html b/images_build/server_web/domains/key-exchange/dh-composite/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh-composite/index.html
rename to images_build/server_web/domains/key-exchange/dh-composite/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/dh-small-subgroup.conf b/images_build/server_web/domains/key-exchange/dh-small-subgroup.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh-small-subgroup.conf
rename to images_build/server_web/domains/key-exchange/dh-small-subgroup.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh-small-subgroup/index.html b/images_build/server_web/domains/key-exchange/dh-small-subgroup/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh-small-subgroup/index.html
rename to images_build/server_web/domains/key-exchange/dh-small-subgroup/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/dh1024.conf b/images_build/server_web/domains/key-exchange/dh1024.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh1024.conf
rename to images_build/server_web/domains/key-exchange/dh1024.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh1024/index.html b/images_build/server_web/domains/key-exchange/dh1024/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh1024/index.html
rename to images_build/server_web/domains/key-exchange/dh1024/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/dh2048.conf b/images_build/server_web/domains/key-exchange/dh2048.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh2048.conf
rename to images_build/server_web/domains/key-exchange/dh2048.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh2048/index.html b/images_build/server_web/domains/key-exchange/dh2048/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh2048/index.html
rename to images_build/server_web/domains/key-exchange/dh2048/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/dh480.conf b/images_build/server_web/domains/key-exchange/dh480.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh480.conf
rename to images_build/server_web/domains/key-exchange/dh480.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh480/index.html b/images_build/server_web/domains/key-exchange/dh480/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh480/index.html
rename to images_build/server_web/domains/key-exchange/dh480/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/dh512.conf b/images_build/server_web/domains/key-exchange/dh512.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh512.conf
rename to images_build/server_web/domains/key-exchange/dh512.conf
diff --git a/images_build/badssl.com/domains/key-exchange/dh512/index.html b/images_build/server_web/domains/key-exchange/dh512/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/dh512/index.html
rename to images_build/server_web/domains/key-exchange/dh512/index.html
diff --git a/images_build/badssl.com/domains/key-exchange/static-rsa.conf b/images_build/server_web/domains/key-exchange/static-rsa.conf
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/static-rsa.conf
rename to images_build/server_web/domains/key-exchange/static-rsa.conf
diff --git a/images_build/badssl.com/domains/key-exchange/static-rsa/index.html b/images_build/server_web/domains/key-exchange/static-rsa/index.html
similarity index 100%
rename from images_build/badssl.com/domains/key-exchange/static-rsa/index.html
rename to images_build/server_web/domains/key-exchange/static-rsa/index.html
diff --git a/images_build/badssl.com/domains/known-bad/dsdtestprovider.conf b/images_build/server_web/domains/known-bad/dsdtestprovider.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/dsdtestprovider.conf
rename to images_build/server_web/domains/known-bad/dsdtestprovider.conf
diff --git a/images_build/badssl.com/domains/known-bad/dsdtestprovider/index.html b/images_build/server_web/domains/known-bad/dsdtestprovider/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/dsdtestprovider/index.html
rename to images_build/server_web/domains/known-bad/dsdtestprovider/index.html
diff --git a/images_build/badssl.com/domains/known-bad/edellroot.conf b/images_build/server_web/domains/known-bad/edellroot.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/edellroot.conf
rename to images_build/server_web/domains/known-bad/edellroot.conf
diff --git a/images_build/badssl.com/domains/known-bad/edellroot/index.html b/images_build/server_web/domains/known-bad/edellroot/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/edellroot/index.html
rename to images_build/server_web/domains/known-bad/edellroot/index.html
diff --git a/images_build/badssl.com/domains/known-bad/mitm-software.conf b/images_build/server_web/domains/known-bad/mitm-software.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/mitm-software.conf
rename to images_build/server_web/domains/known-bad/mitm-software.conf
diff --git a/images_build/badssl.com/domains/known-bad/mitm-software/index.html b/images_build/server_web/domains/known-bad/mitm-software/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/mitm-software/index.html
rename to images_build/server_web/domains/known-bad/mitm-software/index.html
diff --git a/images_build/badssl.com/domains/known-bad/preact-cli.conf b/images_build/server_web/domains/known-bad/preact-cli.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/preact-cli.conf
rename to images_build/server_web/domains/known-bad/preact-cli.conf
diff --git a/images_build/badssl.com/domains/known-bad/preact-cli/index.html b/images_build/server_web/domains/known-bad/preact-cli/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/preact-cli/index.html
rename to images_build/server_web/domains/known-bad/preact-cli/index.html
diff --git a/images_build/badssl.com/domains/known-bad/superfish.conf b/images_build/server_web/domains/known-bad/superfish.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/superfish.conf
rename to images_build/server_web/domains/known-bad/superfish.conf
diff --git a/images_build/badssl.com/domains/known-bad/superfish/index.html b/images_build/server_web/domains/known-bad/superfish/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/superfish/index.html
rename to images_build/server_web/domains/known-bad/superfish/index.html
diff --git a/images_build/badssl.com/domains/known-bad/webpack-dev-server.conf b/images_build/server_web/domains/known-bad/webpack-dev-server.conf
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/webpack-dev-server.conf
rename to images_build/server_web/domains/known-bad/webpack-dev-server.conf
diff --git a/images_build/badssl.com/domains/known-bad/webpack-dev-server/index.html b/images_build/server_web/domains/known-bad/webpack-dev-server/index.html
similarity index 100%
rename from images_build/badssl.com/domains/known-bad/webpack-dev-server/index.html
rename to images_build/server_web/domains/known-bad/webpack-dev-server/index.html
diff --git a/images_build/badssl.com/domains/misc/badssl.com.conf b/images_build/server_web/domains/misc/badssl.com.conf
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com.conf
rename to images_build/server_web/domains/misc/badssl.com.conf
diff --git a/images_build/badssl.com/domains/misc/badssl.com/dashboard/index.css b/images_build/server_web/domains/misc/badssl.com/dashboard/index.css
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/dashboard/index.css
rename to images_build/server_web/domains/misc/badssl.com/dashboard/index.css
diff --git a/images_build/badssl.com/domains/misc/badssl.com/dashboard/index.html b/images_build/server_web/domains/misc/badssl.com/dashboard/index.html
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/dashboard/index.html
rename to images_build/server_web/domains/misc/badssl.com/dashboard/index.html
diff --git a/images_build/badssl.com/domains/misc/badssl.com/dashboard/index.js b/images_build/server_web/domains/misc/badssl.com/dashboard/index.js
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/dashboard/index.js
rename to images_build/server_web/domains/misc/badssl.com/dashboard/index.js
diff --git a/images_build/badssl.com/domains/misc/badssl.com/dashboard/sets.js b/images_build/server_web/domains/misc/badssl.com/dashboard/sets.js
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/dashboard/sets.js
rename to images_build/server_web/domains/misc/badssl.com/dashboard/sets.js
diff --git a/images_build/badssl.com/domains/misc/badssl.com/download/index.css b/images_build/server_web/domains/misc/badssl.com/download/index.css
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/download/index.css
rename to images_build/server_web/domains/misc/badssl.com/download/index.css
diff --git a/images_build/badssl.com/domains/misc/badssl.com/download/index.html b/images_build/server_web/domains/misc/badssl.com/download/index.html
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/download/index.html
rename to images_build/server_web/domains/misc/badssl.com/download/index.html
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bad-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/bad-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bad-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/bad-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bad.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/bad.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bad.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/bad.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bullet-list-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/bullet-list-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bullet-list-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/bullet-list-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bullet-list.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/bullet-list.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/bullet-list.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/bullet-list.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/chrome.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/chrome.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/chrome.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/chrome.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/dubious-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/dubious-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/dubious-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/dubious-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/dubious.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/dubious.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/dubious.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/dubious.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/external-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/external-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/external-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/external-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/external.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/external.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/external.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/external.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/good-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/good-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/good-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/good-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/good.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/good.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/good.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/good.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/info-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/info-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/info-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/info-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/info.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/info.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/info.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/info.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/page-white.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/page-white.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/page-white.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/page-white.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/front-page-icons/page.svg b/images_build/server_web/domains/misc/badssl.com/front-page-icons/page.svg
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/front-page-icons/page.svg
rename to images_build/server_web/domains/misc/badssl.com/front-page-icons/page.svg
diff --git a/images_build/badssl.com/domains/misc/badssl.com/funky/funky.css b/images_build/server_web/domains/misc/badssl.com/funky/funky.css
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/funky/funky.css
rename to images_build/server_web/domains/misc/badssl.com/funky/funky.css
diff --git a/images_build/badssl.com/domains/misc/badssl.com/funky/funky.js b/images_build/server_web/domains/misc/badssl.com/funky/funky.js
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/funky/funky.js
rename to images_build/server_web/domains/misc/badssl.com/funky/funky.js
diff --git a/images_build/badssl.com/domains/misc/badssl.com/github-ribbon.css b/images_build/server_web/domains/misc/badssl.com/github-ribbon.css
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/github-ribbon.css
rename to images_build/server_web/domains/misc/badssl.com/github-ribbon.css
diff --git a/images_build/badssl.com/domains/misc/badssl.com/index.css b/images_build/server_web/domains/misc/badssl.com/index.css
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/index.css
rename to images_build/server_web/domains/misc/badssl.com/index.css
diff --git a/images_build/badssl.com/domains/misc/badssl.com/index.html b/images_build/server_web/domains/misc/badssl.com/index.html
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/index.html
rename to images_build/server_web/domains/misc/badssl.com/index.html
diff --git a/images_build/badssl.com/domains/misc/badssl.com/index.js b/images_build/server_web/domains/misc/badssl.com/index.js
similarity index 100%
rename from images_build/badssl.com/domains/misc/badssl.com/index.js
rename to images_build/server_web/domains/misc/badssl.com/index.js
diff --git a/images_build/badssl.com/domains/misc/www.conf b/images_build/server_web/domains/misc/www.conf
similarity index 100%
rename from images_build/badssl.com/domains/misc/www.conf
rename to images_build/server_web/domains/misc/www.conf
diff --git a/images_build/badssl.com/domains/mixed/mixed-favicon.conf b/images_build/server_web/domains/mixed/mixed-favicon.conf
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-favicon.conf
rename to images_build/server_web/domains/mixed/mixed-favicon.conf
diff --git a/images_build/badssl.com/domains/mixed/mixed-favicon/favicon.ico b/images_build/server_web/domains/mixed/mixed-favicon/favicon.ico
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-favicon/favicon.ico
rename to images_build/server_web/domains/mixed/mixed-favicon/favicon.ico
diff --git a/images_build/badssl.com/domains/mixed/mixed-favicon/index.html b/images_build/server_web/domains/mixed/mixed-favicon/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-favicon/index.html
rename to images_build/server_web/domains/mixed/mixed-favicon/index.html
diff --git a/images_build/badssl.com/domains/mixed/mixed-form.conf b/images_build/server_web/domains/mixed/mixed-form.conf
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-form.conf
rename to images_build/server_web/domains/mixed/mixed-form.conf
diff --git a/images_build/badssl.com/domains/mixed/mixed-form/index.html b/images_build/server_web/domains/mixed/mixed-form/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-form/index.html
rename to images_build/server_web/domains/mixed/mixed-form/index.html
diff --git a/images_build/badssl.com/domains/mixed/mixed-script.conf b/images_build/server_web/domains/mixed/mixed-script.conf
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-script.conf
rename to images_build/server_web/domains/mixed/mixed-script.conf
diff --git a/images_build/badssl.com/domains/mixed/mixed-script/index.html b/images_build/server_web/domains/mixed/mixed-script/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-script/index.html
rename to images_build/server_web/domains/mixed/mixed-script/index.html
diff --git a/images_build/badssl.com/domains/mixed/mixed-script/nonsecure.js b/images_build/server_web/domains/mixed/mixed-script/nonsecure.js
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed-script/nonsecure.js
rename to images_build/server_web/domains/mixed/mixed-script/nonsecure.js
diff --git a/images_build/badssl.com/domains/mixed/mixed.conf b/images_build/server_web/domains/mixed/mixed.conf
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed.conf
rename to images_build/server_web/domains/mixed/mixed.conf
diff --git a/images_build/badssl.com/domains/mixed/mixed/delayed/index.html b/images_build/server_web/domains/mixed/mixed/delayed/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed/delayed/index.html
rename to images_build/server_web/domains/mixed/mixed/delayed/index.html
diff --git a/images_build/badssl.com/domains/mixed/mixed/image.jpg b/images_build/server_web/domains/mixed/mixed/image.jpg
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed/image.jpg
rename to images_build/server_web/domains/mixed/mixed/image.jpg
diff --git a/images_build/badssl.com/domains/mixed/mixed/index.html b/images_build/server_web/domains/mixed/mixed/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/mixed/index.html
rename to images_build/server_web/domains/mixed/mixed/index.html
diff --git a/images_build/badssl.com/domains/mixed/very.conf b/images_build/server_web/domains/mixed/very.conf
similarity index 100%
rename from images_build/badssl.com/domains/mixed/very.conf
rename to images_build/server_web/domains/mixed/very.conf
diff --git a/images_build/badssl.com/domains/mixed/very/delayed/index.html b/images_build/server_web/domains/mixed/very/delayed/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/very/delayed/index.html
rename to images_build/server_web/domains/mixed/very/delayed/index.html
diff --git a/images_build/badssl.com/domains/mixed/very/image.jpg b/images_build/server_web/domains/mixed/very/image.jpg
similarity index 100%
rename from images_build/badssl.com/domains/mixed/very/image.jpg
rename to images_build/server_web/domains/mixed/very/image.jpg
diff --git a/images_build/badssl.com/domains/mixed/very/index.html b/images_build/server_web/domains/mixed/very/index.html
similarity index 100%
rename from images_build/badssl.com/domains/mixed/very/index.html
rename to images_build/server_web/domains/mixed/very/index.html
diff --git a/images_build/badssl.com/domains/protocol/ssl-v2.conf b/images_build/server_web/domains/protocol/ssl-v2.conf
similarity index 100%
rename from images_build/badssl.com/domains/protocol/ssl-v2.conf
rename to images_build/server_web/domains/protocol/ssl-v2.conf
diff --git a/images_build/badssl.com/domains/protocol/ssl-v2/index.html b/images_build/server_web/domains/protocol/ssl-v2/index.html
similarity index 100%
rename from images_build/badssl.com/domains/protocol/ssl-v2/index.html
rename to images_build/server_web/domains/protocol/ssl-v2/index.html
diff --git a/images_build/badssl.com/domains/protocol/ssl-v3.conf b/images_build/server_web/domains/protocol/ssl-v3.conf
similarity index 100%
rename from images_build/badssl.com/domains/protocol/ssl-v3.conf
rename to images_build/server_web/domains/protocol/ssl-v3.conf
diff --git a/images_build/badssl.com/domains/protocol/ssl-v3/index.html b/images_build/server_web/domains/protocol/ssl-v3/index.html
similarity index 100%
rename from images_build/badssl.com/domains/protocol/ssl-v3/index.html
rename to images_build/server_web/domains/protocol/ssl-v3/index.html
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-0.conf b/images_build/server_web/domains/protocol/tls-v1-0.conf
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-0.conf
rename to images_build/server_web/domains/protocol/tls-v1-0.conf
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-0/index.html b/images_build/server_web/domains/protocol/tls-v1-0/index.html
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-0/index.html
rename to images_build/server_web/domains/protocol/tls-v1-0/index.html
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-1.conf b/images_build/server_web/domains/protocol/tls-v1-1.conf
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-1.conf
rename to images_build/server_web/domains/protocol/tls-v1-1.conf
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-1/index.html b/images_build/server_web/domains/protocol/tls-v1-1/index.html
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-1/index.html
rename to images_build/server_web/domains/protocol/tls-v1-1/index.html
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-2.conf b/images_build/server_web/domains/protocol/tls-v1-2.conf
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-2.conf
rename to images_build/server_web/domains/protocol/tls-v1-2.conf
diff --git a/images_build/badssl.com/domains/protocol/tls-v1-2/index.html b/images_build/server_web/domains/protocol/tls-v1-2/index.html
similarity index 100%
rename from images_build/badssl.com/domains/protocol/tls-v1-2/index.html
rename to images_build/server_web/domains/protocol/tls-v1-2/index.html
diff --git a/images_build/badssl.com/domains/testing-download/download.conf b/images_build/server_web/domains/testing-download/download.conf
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download.conf
rename to images_build/server_web/domains/testing-download/download.conf
diff --git a/images_build/badssl.com/domains/testing-download/download/download/index.css b/images_build/server_web/domains/testing-download/download/download/index.css
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/download/index.css
rename to images_build/server_web/domains/testing-download/download/download/index.css
diff --git a/images_build/badssl.com/domains/testing-download/download/download/index.html b/images_build/server_web/domains/testing-download/download/download/index.html
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/download/index.html
rename to images_build/server_web/domains/testing-download/download/download/index.html
diff --git a/images_build/badssl.com/domains/testing-download/download/index.html b/images_build/server_web/domains/testing-download/download/index.html
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/index.html
rename to images_build/server_web/domains/testing-download/download/index.html
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/16M b/images_build/server_web/domains/testing-download/download/resources/16M
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/16M
rename to images_build/server_web/domains/testing-download/download/resources/16M
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/16k b/images_build/server_web/domains/testing-download/download/resources/16k
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/16k
rename to images_build/server_web/domains/testing-download/download/resources/16k
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/1M b/images_build/server_web/domains/testing-download/download/resources/1M
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/1M
rename to images_build/server_web/domains/testing-download/download/resources/1M
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/1k b/images_build/server_web/domains/testing-download/download/resources/1k
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/1k
rename to images_build/server_web/domains/testing-download/download/resources/1k
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/256k b/images_build/server_web/domains/testing-download/download/resources/256k
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/256k
rename to images_build/server_web/domains/testing-download/download/resources/256k
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/4M b/images_build/server_web/domains/testing-download/download/resources/4M
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/4M
rename to images_build/server_web/domains/testing-download/download/resources/4M
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/4k b/images_build/server_web/domains/testing-download/download/resources/4k
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/4k
rename to images_build/server_web/domains/testing-download/download/resources/4k
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/64M b/images_build/server_web/domains/testing-download/download/resources/64M
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/64M
rename to images_build/server_web/domains/testing-download/download/resources/64M
diff --git a/images_build/badssl.com/domains/testing-download/download/resources/64k b/images_build/server_web/domains/testing-download/download/resources/64k
similarity index 100%
rename from images_build/badssl.com/domains/testing-download/download/resources/64k
rename to images_build/server_web/domains/testing-download/download/resources/64k
diff --git a/images_build/badssl.com/domains/ui/lock-title.conf b/images_build/server_web/domains/ui/lock-title.conf
similarity index 100%
rename from images_build/badssl.com/domains/ui/lock-title.conf
rename to images_build/server_web/domains/ui/lock-title.conf
diff --git a/images_build/badssl.com/domains/ui/lock-title/index.html b/images_build/server_web/domains/ui/lock-title/index.html
similarity index 100%
rename from images_build/badssl.com/domains/ui/lock-title/index.html
rename to images_build/server_web/domains/ui/lock-title/index.html
diff --git a/images_build/badssl.com/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes.conf b/images_build/server_web/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes.conf
similarity index 100%
rename from images_build/badssl.com/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes.conf
rename to images_build/server_web/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes.conf
diff --git a/images_build/badssl.com/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes/index.html b/images_build/server_web/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes/index.html
similarity index 100%
rename from images_build/badssl.com/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes/index.html
rename to images_build/server_web/domains/ui/long-extended-subdomain-name-containing-many-letters-and-dashes/index.html
diff --git a/images_build/badssl.com/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.conf b/images_build/server_web/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.conf
similarity index 100%
rename from images_build/badssl.com/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.conf
rename to images_build/server_web/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.conf
diff --git a/images_build/badssl.com/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping/index.html b/images_build/server_web/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping/index.html
similarity index 100%
rename from images_build/badssl.com/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping/index.html
rename to images_build/server_web/domains/ui/longextendedsubdomainnamewithoutdashesinordertotestwordwrapping/index.html
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon.conf b/images_build/server_web/domains/ui/spoofed-favicon.conf
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon.conf
rename to images_build/server_web/domains/ui/spoofed-favicon.conf
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-chrome-mobile.ico b/images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-chrome-mobile.ico
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-chrome-mobile.ico
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-chrome-mobile.ico
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-chrome.ico b/images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-chrome.ico
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-chrome.ico
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-chrome.ico
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-fennec.ico b/images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-fennec.ico
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-fennec.ico
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-fennec.ico
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-firefox.ico b/images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-firefox.ico
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/favicon-firefox.ico
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/favicon-firefox.ico
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-chrome-mobile.png b/images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-chrome-mobile.png
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-chrome-mobile.png
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-chrome-mobile.png
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-chrome.png b/images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-chrome.png
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-chrome.png
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-chrome.png
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-fennec.png b/images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-fennec.png
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-fennec.png
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-fennec.png
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-firefox.png b/images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-firefox.png
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/favicons/icon-firefox.png
rename to images_build/server_web/domains/ui/spoofed-favicon/favicons/icon-firefox.png
diff --git a/images_build/badssl.com/domains/ui/spoofed-favicon/index.html b/images_build/server_web/domains/ui/spoofed-favicon/index.html
similarity index 100%
rename from images_build/badssl.com/domains/ui/spoofed-favicon/index.html
rename to images_build/server_web/domains/ui/spoofed-favicon/index.html
diff --git a/images_build/badssl.com/domains/upgrade/hsts-http/hsts-test/status.svg b/images_build/server_web/domains/upgrade/hsts-http/hsts-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/hsts-http/hsts-test/status.svg
rename to images_build/server_web/domains/upgrade/hsts-http/hsts-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/hsts-http/index.html b/images_build/server_web/domains/upgrade/hsts-http/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/hsts-http/index.html
rename to images_build/server_web/domains/upgrade/hsts-http/index.html
diff --git a/images_build/badssl.com/domains/upgrade/hsts-https/hsts-test/status.svg b/images_build/server_web/domains/upgrade/hsts-https/hsts-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/hsts-https/hsts-test/status.svg
rename to images_build/server_web/domains/upgrade/hsts-https/hsts-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/hsts-https/index.html b/images_build/server_web/domains/upgrade/hsts-https/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/hsts-https/index.html
rename to images_build/server_web/domains/upgrade/hsts-https/index.html
diff --git a/images_build/badssl.com/domains/upgrade/hsts.conf b/images_build/server_web/domains/upgrade/hsts.conf
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/hsts.conf
rename to images_build/server_web/domains/upgrade/hsts.conf
diff --git a/images_build/badssl.com/domains/upgrade/https-everywhere-http/index.html b/images_build/server_web/domains/upgrade/https-everywhere-http/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/https-everywhere-http/index.html
rename to images_build/server_web/domains/upgrade/https-everywhere-http/index.html
diff --git a/images_build/badssl.com/domains/upgrade/https-everywhere-http/redirect-test/status.svg b/images_build/server_web/domains/upgrade/https-everywhere-http/redirect-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/https-everywhere-http/redirect-test/status.svg
rename to images_build/server_web/domains/upgrade/https-everywhere-http/redirect-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/https-everywhere-https/index.html b/images_build/server_web/domains/upgrade/https-everywhere-https/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/https-everywhere-https/index.html
rename to images_build/server_web/domains/upgrade/https-everywhere-https/index.html
diff --git a/images_build/badssl.com/domains/upgrade/https-everywhere-https/redirect-test/status.svg b/images_build/server_web/domains/upgrade/https-everywhere-https/redirect-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/https-everywhere-https/redirect-test/status.svg
rename to images_build/server_web/domains/upgrade/https-everywhere-https/redirect-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/https-everywhere.conf b/images_build/server_web/domains/upgrade/https-everywhere.conf
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/https-everywhere.conf
rename to images_build/server_web/domains/upgrade/https-everywhere.conf
diff --git a/images_build/badssl.com/domains/upgrade/preloaded-hsts-http/hsts-test/status.svg b/images_build/server_web/domains/upgrade/preloaded-hsts-http/hsts-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/preloaded-hsts-http/hsts-test/status.svg
rename to images_build/server_web/domains/upgrade/preloaded-hsts-http/hsts-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/preloaded-hsts-http/index.html b/images_build/server_web/domains/upgrade/preloaded-hsts-http/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/preloaded-hsts-http/index.html
rename to images_build/server_web/domains/upgrade/preloaded-hsts-http/index.html
diff --git a/images_build/badssl.com/domains/upgrade/preloaded-hsts-https/hsts-test/status.svg b/images_build/server_web/domains/upgrade/preloaded-hsts-https/hsts-test/status.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/preloaded-hsts-https/hsts-test/status.svg
rename to images_build/server_web/domains/upgrade/preloaded-hsts-https/hsts-test/status.svg
diff --git a/images_build/badssl.com/domains/upgrade/preloaded-hsts-https/index.html b/images_build/server_web/domains/upgrade/preloaded-hsts-https/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/preloaded-hsts-https/index.html
rename to images_build/server_web/domains/upgrade/preloaded-hsts-https/index.html
diff --git a/images_build/badssl.com/domains/upgrade/preloaded-hsts.conf b/images_build/server_web/domains/upgrade/preloaded-hsts.conf
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/preloaded-hsts.conf
rename to images_build/server_web/domains/upgrade/preloaded-hsts.conf
diff --git a/images_build/badssl.com/domains/upgrade/subdomain.preloaded-hsts.conf b/images_build/server_web/domains/upgrade/subdomain.preloaded-hsts.conf
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/subdomain.preloaded-hsts.conf
rename to images_build/server_web/domains/upgrade/subdomain.preloaded-hsts.conf
diff --git a/images_build/badssl.com/domains/upgrade/subdomain.preloaded-hsts/index.html b/images_build/server_web/domains/upgrade/subdomain.preloaded-hsts/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/subdomain.preloaded-hsts/index.html
rename to images_build/server_web/domains/upgrade/subdomain.preloaded-hsts/index.html
diff --git a/images_build/badssl.com/domains/upgrade/upgrade-http/upgrade-test/upgrade-test.svg b/images_build/server_web/domains/upgrade/upgrade-http/upgrade-test/upgrade-test.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/upgrade-http/upgrade-test/upgrade-test.svg
rename to images_build/server_web/domains/upgrade/upgrade-http/upgrade-test/upgrade-test.svg
diff --git a/images_build/badssl.com/domains/upgrade/upgrade-https/index.html b/images_build/server_web/domains/upgrade/upgrade-https/index.html
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/upgrade-https/index.html
rename to images_build/server_web/domains/upgrade/upgrade-https/index.html
diff --git a/images_build/badssl.com/domains/upgrade/upgrade-https/upgrade-test/upgrade-test.svg b/images_build/server_web/domains/upgrade/upgrade-https/upgrade-test/upgrade-test.svg
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/upgrade-https/upgrade-test/upgrade-test.svg
rename to images_build/server_web/domains/upgrade/upgrade-https/upgrade-test/upgrade-test.svg
diff --git a/images_build/badssl.com/domains/upgrade/upgrade.conf b/images_build/server_web/domains/upgrade/upgrade.conf
similarity index 100%
rename from images_build/badssl.com/domains/upgrade/upgrade.conf
rename to images_build/server_web/domains/upgrade/upgrade.conf
diff --git a/images_build/badssl.com/domains/web-replay/replay.conf b/images_build/server_web/domains/web-replay/replay.conf
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay.conf
rename to images_build/server_web/domains/web-replay/replay.conf
diff --git a/images_build/badssl.com/domains/web-replay/replay/download/index.css b/images_build/server_web/domains/web-replay/replay/download/index.css
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/download/index.css
rename to images_build/server_web/domains/web-replay/replay/download/index.css
diff --git a/images_build/badssl.com/domains/web-replay/replay/download/index.html b/images_build/server_web/domains/web-replay/replay/download/index.html
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/download/index.html
rename to images_build/server_web/domains/web-replay/replay/download/index.html
diff --git a/images_build/badssl.com/domains/web-replay/replay/index.html b/images_build/server_web/domains/web-replay/replay/index.html
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/index.html
rename to images_build/server_web/domains/web-replay/replay/index.html
diff --git a/images_build/badssl.com/domains/web-replay/replay/resources/proxyBlock.js b/images_build/server_web/domains/web-replay/replay/resources/proxyBlock.js
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/resources/proxyBlock.js
rename to images_build/server_web/domains/web-replay/replay/resources/proxyBlock.js
diff --git a/images_build/badssl.com/domains/web-replay/replay/resources/proxyHijack.js b/images_build/server_web/domains/web-replay/replay/resources/proxyHijack.js
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/resources/proxyHijack.js
rename to images_build/server_web/domains/web-replay/replay/resources/proxyHijack.js
diff --git a/images_build/badssl.com/domains/web-replay/replay/resources/proxyInsert b/images_build/server_web/domains/web-replay/replay/resources/proxyInsert
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/resources/proxyInsert
rename to images_build/server_web/domains/web-replay/replay/resources/proxyInsert
diff --git a/images_build/badssl.com/domains/web-replay/replay/resources/proxyRedirect.js b/images_build/server_web/domains/web-replay/replay/resources/proxyRedirect.js
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/resources/proxyRedirect.js
rename to images_build/server_web/domains/web-replay/replay/resources/proxyRedirect.js
diff --git a/images_build/badssl.com/domains/web-replay/replay/resources/proxyReplace.js b/images_build/server_web/domains/web-replay/replay/resources/proxyReplace.js
similarity index 100%
rename from images_build/badssl.com/domains/web-replay/replay/resources/proxyReplace.js
rename to images_build/server_web/domains/web-replay/replay/resources/proxyReplace.js
diff --git a/images_build/badssl.com/fallback-common.conf b/images_build/server_web/fallback-common.conf
similarity index 100%
rename from images_build/badssl.com/fallback-common.conf
rename to images_build/server_web/fallback-common.conf
diff --git a/images_build/badssl.com/fallback.conf b/images_build/server_web/fallback.conf
similarity index 100%
rename from images_build/badssl.com/fallback.conf
rename to images_build/server_web/fallback.conf
diff --git a/images_build/badssl.com/nginx-includes/basic-auth.htpasswd b/images_build/server_web/nginx-includes/basic-auth.htpasswd
similarity index 100%
rename from images_build/badssl.com/nginx-includes/basic-auth.htpasswd
rename to images_build/server_web/nginx-includes/basic-auth.htpasswd
diff --git a/images_build/badssl.com/nginx-includes/client-cert-missing.conf b/images_build/server_web/nginx-includes/client-cert-missing.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/client-cert-missing.conf
rename to images_build/server_web/nginx-includes/client-cert-missing.conf
diff --git a/images_build/badssl.com/nginx-includes/client-normal.conf b/images_build/server_web/nginx-includes/client-normal.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/client-normal.conf
rename to images_build/server_web/nginx-includes/client-normal.conf
diff --git a/images_build/badssl.com/nginx-includes/ssl-v2.conf b/images_build/server_web/nginx-includes/ssl-v2.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/ssl-v2.conf
rename to images_build/server_web/nginx-includes/ssl-v2.conf
diff --git a/images_build/badssl.com/nginx-includes/ssl-v3.conf b/images_build/server_web/nginx-includes/ssl-v3.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/ssl-v3.conf
rename to images_build/server_web/nginx-includes/ssl-v3.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-1000-sans.conf b/images_build/server_web/nginx-includes/subdomain-1000-sans.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-1000-sans.conf
rename to images_build/server_web/nginx-includes/subdomain-1000-sans.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-10000-sans.conf b/images_build/server_web/nginx-includes/subdomain-10000-sans.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-10000-sans.conf
rename to images_build/server_web/nginx-includes/subdomain-10000-sans.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-captive-portal.conf b/images_build/server_web/nginx-includes/subdomain-captive-portal.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-captive-portal.conf
rename to images_build/server_web/nginx-includes/subdomain-captive-portal.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-dsdtestprovider.conf b/images_build/server_web/nginx-includes/subdomain-dsdtestprovider.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-dsdtestprovider.conf
rename to images_build/server_web/nginx-includes/subdomain-dsdtestprovider.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-edellroot.conf b/images_build/server_web/nginx-includes/subdomain-edellroot.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-edellroot.conf
rename to images_build/server_web/nginx-includes/subdomain-edellroot.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-extended-validation.conf b/images_build/server_web/nginx-includes/subdomain-extended-validation.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-extended-validation.conf
rename to images_build/server_web/nginx-includes/subdomain-extended-validation.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-invalid-expected-sct.conf b/images_build/server_web/nginx-includes/subdomain-invalid-expected-sct.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-invalid-expected-sct.conf
rename to images_build/server_web/nginx-includes/subdomain-invalid-expected-sct.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-mitm-software.conf b/images_build/server_web/nginx-includes/subdomain-mitm-software.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-mitm-software.conf
rename to images_build/server_web/nginx-includes/subdomain-mitm-software.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-no-common-name.conf b/images_build/server_web/nginx-includes/subdomain-no-common-name.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-no-common-name.conf
rename to images_build/server_web/nginx-includes/subdomain-no-common-name.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-no-san.conf b/images_build/server_web/nginx-includes/subdomain-no-san.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-no-san.conf
rename to images_build/server_web/nginx-includes/subdomain-no-san.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-no-sct.conf b/images_build/server_web/nginx-includes/subdomain-no-sct.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-no-sct.conf
rename to images_build/server_web/nginx-includes/subdomain-no-sct.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-no-subject.conf b/images_build/server_web/nginx-includes/subdomain-no-subject.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-no-subject.conf
rename to images_build/server_web/nginx-includes/subdomain-no-subject.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-preact-cli.conf b/images_build/server_web/nginx-includes/subdomain-preact-cli.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-preact-cli.conf
rename to images_build/server_web/nginx-includes/subdomain-preact-cli.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-preloaded-expect-ct.conf b/images_build/server_web/nginx-includes/subdomain-preloaded-expect-ct.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-preloaded-expect-ct.conf
rename to images_build/server_web/nginx-includes/subdomain-preloaded-expect-ct.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-revoked.conf b/images_build/server_web/nginx-includes/subdomain-revoked.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-revoked.conf
rename to images_build/server_web/nginx-includes/subdomain-revoked.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-superfish.conf b/images_build/server_web/nginx-includes/subdomain-superfish.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-superfish.conf
rename to images_build/server_web/nginx-includes/subdomain-superfish.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-webpack-dev-server.conf b/images_build/server_web/nginx-includes/subdomain-webpack-dev-server.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-webpack-dev-server.conf
rename to images_build/server_web/nginx-includes/subdomain-webpack-dev-server.conf
diff --git a/images_build/badssl.com/nginx-includes/subdomain-xn--n1aae7f7o.conf b/images_build/server_web/nginx-includes/subdomain-xn--n1aae7f7o.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/subdomain-xn--n1aae7f7o.conf
rename to images_build/server_web/nginx-includes/subdomain-xn--n1aae7f7o.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-3des.conf b/images_build/server_web/nginx-includes/tls-3des.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-3des.conf
rename to images_build/server_web/nginx-includes/tls-3des.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-cbc.conf b/images_build/server_web/nginx-includes/tls-cbc.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-cbc.conf
rename to images_build/server_web/nginx-includes/tls-cbc.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-defaults.conf b/images_build/server_web/nginx-includes/tls-defaults.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-defaults.conf
rename to images_build/server_web/nginx-includes/tls-defaults.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh-composite.conf b/images_build/server_web/nginx-includes/tls-dh-composite.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh-composite.conf
rename to images_build/server_web/nginx-includes/tls-dh-composite.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh-small-subgroup.conf b/images_build/server_web/nginx-includes/tls-dh-small-subgroup.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh-small-subgroup.conf
rename to images_build/server_web/nginx-includes/tls-dh-small-subgroup.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh1024.conf b/images_build/server_web/nginx-includes/tls-dh1024.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh1024.conf
rename to images_build/server_web/nginx-includes/tls-dh1024.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh2048.conf b/images_build/server_web/nginx-includes/tls-dh2048.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh2048.conf
rename to images_build/server_web/nginx-includes/tls-dh2048.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh480.conf b/images_build/server_web/nginx-includes/tls-dh480.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh480.conf
rename to images_build/server_web/nginx-includes/tls-dh480.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-dh512.conf b/images_build/server_web/nginx-includes/tls-dh512.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-dh512.conf
rename to images_build/server_web/nginx-includes/tls-dh512.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-mozilla-intermediate.conf b/images_build/server_web/nginx-includes/tls-mozilla-intermediate.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-mozilla-intermediate.conf
rename to images_build/server_web/nginx-includes/tls-mozilla-intermediate.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-mozilla-modern.conf b/images_build/server_web/nginx-includes/tls-mozilla-modern.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-mozilla-modern.conf
rename to images_build/server_web/nginx-includes/tls-mozilla-modern.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-mozilla-old.conf b/images_build/server_web/nginx-includes/tls-mozilla-old.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-mozilla-old.conf
rename to images_build/server_web/nginx-includes/tls-mozilla-old.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-null.conf b/images_build/server_web/nginx-includes/tls-null.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-null.conf
rename to images_build/server_web/nginx-includes/tls-null.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-rc4-md5.conf b/images_build/server_web/nginx-includes/tls-rc4-md5.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-rc4-md5.conf
rename to images_build/server_web/nginx-includes/tls-rc4-md5.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-rc4.conf b/images_build/server_web/nginx-includes/tls-rc4.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-rc4.conf
rename to images_build/server_web/nginx-includes/tls-rc4.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-static-rsa.conf b/images_build/server_web/nginx-includes/tls-static-rsa.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-static-rsa.conf
rename to images_build/server_web/nginx-includes/tls-static-rsa.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-v1-0.conf b/images_build/server_web/nginx-includes/tls-v1-0.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-v1-0.conf
rename to images_build/server_web/nginx-includes/tls-v1-0.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-v1-1.conf b/images_build/server_web/nginx-includes/tls-v1-1.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-v1-1.conf
rename to images_build/server_web/nginx-includes/tls-v1-1.conf
diff --git a/images_build/badssl.com/nginx-includes/tls-v1-2.conf b/images_build/server_web/nginx-includes/tls-v1-2.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/tls-v1-2.conf
rename to images_build/server_web/nginx-includes/tls-v1-2.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-ecc256.conf b/images_build/server_web/nginx-includes/wildcard-ecc256.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-ecc256.conf
rename to images_build/server_web/nginx-includes/wildcard-ecc256.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-ecc384.conf b/images_build/server_web/nginx-includes/wildcard-ecc384.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-ecc384.conf
rename to images_build/server_web/nginx-includes/wildcard-ecc384.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-expired.conf b/images_build/server_web/nginx-includes/wildcard-expired.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-expired.conf
rename to images_build/server_web/nginx-includes/wildcard-expired.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-fallback.conf b/images_build/server_web/nginx-includes/wildcard-fallback.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-fallback.conf
rename to images_build/server_web/nginx-includes/wildcard-fallback.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-incomplete-chain.conf b/images_build/server_web/nginx-includes/wildcard-incomplete-chain.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-incomplete-chain.conf
rename to images_build/server_web/nginx-includes/wildcard-incomplete-chain.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-md5.conf b/images_build/server_web/nginx-includes/wildcard-md5.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-md5.conf
rename to images_build/server_web/nginx-includes/wildcard-md5.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-normal.conf b/images_build/server_web/nginx-includes/wildcard-normal.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-normal.conf
rename to images_build/server_web/nginx-includes/wildcard-normal.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa1024.conf b/images_build/server_web/nginx-includes/wildcard-rsa1024.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa1024.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa1024.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa2048.conf b/images_build/server_web/nginx-includes/wildcard-rsa2048.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa2048.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa2048.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa3072.conf b/images_build/server_web/nginx-includes/wildcard-rsa3072.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa3072.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa3072.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa4096.conf b/images_build/server_web/nginx-includes/wildcard-rsa4096.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa4096.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa4096.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa512.conf b/images_build/server_web/nginx-includes/wildcard-rsa512.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa512.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa512.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-rsa8192.conf b/images_build/server_web/nginx-includes/wildcard-rsa8192.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-rsa8192.conf
rename to images_build/server_web/nginx-includes/wildcard-rsa8192.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-self-signed.conf b/images_build/server_web/nginx-includes/wildcard-self-signed.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-self-signed.conf
rename to images_build/server_web/nginx-includes/wildcard-self-signed.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-sha1-2016.conf b/images_build/server_web/nginx-includes/wildcard-sha1-2016.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-sha1-2016.conf
rename to images_build/server_web/nginx-includes/wildcard-sha1-2016.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-sha1-2017.conf b/images_build/server_web/nginx-includes/wildcard-sha1-2017.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-sha1-2017.conf
rename to images_build/server_web/nginx-includes/wildcard-sha1-2017.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-sha1-intermediate.conf b/images_build/server_web/nginx-includes/wildcard-sha1-intermediate.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-sha1-intermediate.conf
rename to images_build/server_web/nginx-includes/wildcard-sha1-intermediate.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-sha384.conf b/images_build/server_web/nginx-includes/wildcard-sha384.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-sha384.conf
rename to images_build/server_web/nginx-includes/wildcard-sha384.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-sha512.conf b/images_build/server_web/nginx-includes/wildcard-sha512.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-sha512.conf
rename to images_build/server_web/nginx-includes/wildcard-sha512.conf
diff --git a/images_build/badssl.com/nginx-includes/wildcard-untrusted-root.conf b/images_build/server_web/nginx-includes/wildcard-untrusted-root.conf
similarity index 100%
rename from images_build/badssl.com/nginx-includes/wildcard-untrusted-root.conf
rename to images_build/server_web/nginx-includes/wildcard-untrusted-root.conf
diff --git a/images_build/badssl.com/nginx.conf b/images_build/server_web/nginx.conf
similarity index 100%
rename from images_build/badssl.com/nginx.conf
rename to images_build/server_web/nginx.conf