diff --git a/cors/README.md b/cors/README.md
index b239462625f667..aa5ff90d486e8b 100644
--- a/cors/README.md
+++ b/cors/README.md
@@ -5,4 +5,4 @@ These tests are located here as originally the CORS protocol was defined on its
 More CORS tests can be found in
 
 * /fetch
-* /XMLHttpRequest
+* /xhr
diff --git a/fetch/README.md b/fetch/README.md
index 3c5905690c1942..dcaad0219d5a53 100644
--- a/fetch/README.md
+++ b/fetch/README.md
@@ -3,4 +3,4 @@ Tests for the [Fetch Standard](https://fetch.spec.whatwg.org/).
 More Fetch tests can be found in
 
 * /cors
-* /XMLHttpRequest
+* /xhr
diff --git a/fetch/api/basic/request-headers-case.any.js b/fetch/api/basic/request-headers-case.any.js
index 549744fb05be83..067eabb13329b1 100644
--- a/fetch/api/basic/request-headers-case.any.js
+++ b/fetch/api/basic/request-headers-case.any.js
@@ -1,11 +1,11 @@
 promise_test(() => {
-  return fetch("/XMLHttpRequest/resources/echo-headers.py", {headers: [["THIS-is-A-test", 1], ["THIS-IS-A-TEST", 2]] }).then(res => res.text()).then(body => {
+  return fetch("/xhr/resources/echo-headers.py", {headers: [["THIS-is-A-test", 1], ["THIS-IS-A-TEST", 2]] }).then(res => res.text()).then(body => {
     assert_regexp_match(body, /THIS-is-A-test: 1, 2/)
   })
 }, "Multiple headers with the same name, different case (THIS-is-A-test first)")
 
 promise_test(() => {
-  return fetch("/XMLHttpRequest/resources/echo-headers.py", {headers: [["THIS-IS-A-TEST", 1], ["THIS-is-A-test", 2]] }).then(res => res.text()).then(body => {
+  return fetch("/xhr/resources/echo-headers.py", {headers: [["THIS-IS-A-TEST", 1], ["THIS-is-A-test", 2]] }).then(res => res.text()).then(body => {
     assert_regexp_match(body, /THIS-IS-A-TEST: 1, 2/)
   })
 }, "Multiple headers with the same name, different case (THIS-IS-A-TEST first)")
diff --git a/fetch/api/response/response-trailer.html b/fetch/api/response/response-trailer.html
index 5454040a35632e..cbea155d4dd845 100644
--- a/fetch/api/response/response-trailer.html
+++ b/fetch/api/response/response-trailer.html
@@ -3,10 +3,10 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
-<!-- based on /XMLHttpRequest/getresponseheader-chunked-trailer.htm -->
+<!-- based on /xhr/getresponseheader-chunked-trailer.htm -->
 <script>
 promise_test(() => {
-  return fetch("/XMLHttpRequest/resources/chunked.py").then(res => {
+  return fetch("/xhr/resources/chunked.py").then(res => {
     assert_equals(res.headers.get("Trailer"), "X-Test-Me")
     assert_equals(res.headers.get("X-Test-Me"), null)
     assert_equals(res.headers.get("Content-Type"), "text/plain")
diff --git a/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js b/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js
index 8cfaef024a0a31..07bccb788052e7 100644
--- a/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js
+++ b/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator.any.js
@@ -54,7 +54,7 @@
                     "userAgent should return the value sent in the " +
                     "User-Agent header");
     });
-    request.open("GET", "/XMLHttpRequest/resources/inspect-headers.py?" +
+    request.open("GET", "/xhr/resources/inspect-headers.py?" +
                         "filter_name=User-Agent");
     request.send();
   }, "userAgent value");
diff --git a/lint.whitelist b/lint.whitelist
index 66e3a0e578beef..dcabf436c52825 100644
--- a/lint.whitelist
+++ b/lint.whitelist
@@ -230,8 +230,8 @@ SET TIMEOUT: websockets/*
 SET TIMEOUT: webstorage/eventTestHarness.js
 SET TIMEOUT: webvtt/*
 SET TIMEOUT: workers/*
-SET TIMEOUT: XMLHttpRequest/resources/init.htm
-SET TIMEOUT: XMLHttpRequest/resources/xmlhttprequest-timeout.js
+SET TIMEOUT: xhr/resources/init.htm
+SET TIMEOUT: xhr/resources/xmlhttprequest-timeout.js
 
 # generate_tests implementation and sample usage
 GENERATE_TESTS: resources/test/tests/generate-callback.html
diff --git a/resource-timing/resources/fake_responses.py b/resource-timing/resources/fake_responses.py
index 9f2e43df0693cd..f71693818cb726 100644
--- a/resource-timing/resources/fake_responses.py
+++ b/resource-timing/resources/fake_responses.py
@@ -1,4 +1,4 @@
-# XMLHttpRequest/resources/conditional.py -- to fake a 304 response
+# /xhr/resources/conditional.py -- to fake a 304 response
 
 def main(request, response):
     tag = request.GET.first("tag", None)
diff --git a/XMLHttpRequest/FormData-append.html b/xhr/FormData-append.html
similarity index 100%
rename from XMLHttpRequest/FormData-append.html
rename to xhr/FormData-append.html
diff --git a/XMLHttpRequest/OWNERS b/xhr/OWNERS
similarity index 100%
rename from XMLHttpRequest/OWNERS
rename to xhr/OWNERS
diff --git a/XMLHttpRequest/README.md b/xhr/README.md
similarity index 100%
rename from XMLHttpRequest/README.md
rename to xhr/README.md
diff --git a/XMLHttpRequest/XMLHttpRequest-withCredentials.any.js b/xhr/XMLHttpRequest-withCredentials.any.js
similarity index 100%
rename from XMLHttpRequest/XMLHttpRequest-withCredentials.any.js
rename to xhr/XMLHttpRequest-withCredentials.any.js
diff --git a/XMLHttpRequest/abort-after-receive.htm b/xhr/abort-after-receive.htm
similarity index 100%
rename from XMLHttpRequest/abort-after-receive.htm
rename to xhr/abort-after-receive.htm
diff --git a/XMLHttpRequest/abort-after-send.htm b/xhr/abort-after-send.htm
similarity index 100%
rename from XMLHttpRequest/abort-after-send.htm
rename to xhr/abort-after-send.htm
diff --git a/XMLHttpRequest/abort-after-stop.htm b/xhr/abort-after-stop.htm
similarity index 100%
rename from XMLHttpRequest/abort-after-stop.htm
rename to xhr/abort-after-stop.htm
diff --git a/XMLHttpRequest/abort-after-timeout.htm b/xhr/abort-after-timeout.htm
similarity index 100%
rename from XMLHttpRequest/abort-after-timeout.htm
rename to xhr/abort-after-timeout.htm
diff --git a/XMLHttpRequest/abort-during-done.htm b/xhr/abort-during-done.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-done.htm
rename to xhr/abort-during-done.htm
diff --git a/XMLHttpRequest/abort-during-headers-received.htm b/xhr/abort-during-headers-received.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-headers-received.htm
rename to xhr/abort-during-headers-received.htm
diff --git a/XMLHttpRequest/abort-during-loading.htm b/xhr/abort-during-loading.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-loading.htm
rename to xhr/abort-during-loading.htm
diff --git a/XMLHttpRequest/abort-during-open.htm b/xhr/abort-during-open.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-open.htm
rename to xhr/abort-during-open.htm
diff --git a/XMLHttpRequest/abort-during-open.js b/xhr/abort-during-open.js
similarity index 100%
rename from XMLHttpRequest/abort-during-open.js
rename to xhr/abort-during-open.js
diff --git a/XMLHttpRequest/abort-during-open.worker.js b/xhr/abort-during-open.worker.js
similarity index 100%
rename from XMLHttpRequest/abort-during-open.worker.js
rename to xhr/abort-during-open.worker.js
diff --git a/XMLHttpRequest/abort-during-unsent.htm b/xhr/abort-during-unsent.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-unsent.htm
rename to xhr/abort-during-unsent.htm
diff --git a/XMLHttpRequest/abort-during-upload.htm b/xhr/abort-during-upload.htm
similarity index 100%
rename from XMLHttpRequest/abort-during-upload.htm
rename to xhr/abort-during-upload.htm
diff --git a/XMLHttpRequest/abort-event-abort.htm b/xhr/abort-event-abort.htm
similarity index 100%
rename from XMLHttpRequest/abort-event-abort.htm
rename to xhr/abort-event-abort.htm
diff --git a/XMLHttpRequest/abort-event-listeners.htm b/xhr/abort-event-listeners.htm
similarity index 100%
rename from XMLHttpRequest/abort-event-listeners.htm
rename to xhr/abort-event-listeners.htm
diff --git a/XMLHttpRequest/abort-event-loadend.htm b/xhr/abort-event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/abort-event-loadend.htm
rename to xhr/abort-event-loadend.htm
diff --git a/XMLHttpRequest/abort-event-order.htm b/xhr/abort-event-order.htm
similarity index 100%
rename from XMLHttpRequest/abort-event-order.htm
rename to xhr/abort-event-order.htm
diff --git a/XMLHttpRequest/abort-upload-event-abort.htm b/xhr/abort-upload-event-abort.htm
similarity index 100%
rename from XMLHttpRequest/abort-upload-event-abort.htm
rename to xhr/abort-upload-event-abort.htm
diff --git a/XMLHttpRequest/abort-upload-event-loadend.htm b/xhr/abort-upload-event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/abort-upload-event-loadend.htm
rename to xhr/abort-upload-event-loadend.htm
diff --git a/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm b/xhr/access-control-and-redirects-async-same-origin.htm
similarity index 84%
rename from XMLHttpRequest/access-control-and-redirects-async-same-origin.htm
rename to xhr/access-control-and-redirects-async-same-origin.htm
index 24cc80c228fa1d..14e999c0844511 100644
--- a/XMLHttpRequest/access-control-and-redirects-async-same-origin.htm
+++ b/xhr/access-control-and-redirects-async-same-origin.htm
@@ -33,37 +33,37 @@
 
     // The redirect response passes the access check.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow-star.py",
           withoutCredentials, succeeds)
     }, "Request without credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star)");
 
     // The redirect response fails the access check because credentials were sent.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow-star.py",
           withCredentials, fails)
     }, "Request with credentials is redirected to a cross-origin response with Access-Control-Allow-Origin=* (with star)");
 
     // The redirect response passes the access check.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow.py",
           withoutCredentials, succeeds)
     }, "Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin");
 
     // The redirect response passes the access check.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow.py",
           withCredentials, succeeds)
     }, "Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin");
 
     // forbidding credentials. The redirect response passes the access check.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow-no-credentials.py",
           withoutCredentials, succeeds)
     }, "Request without credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials)");
 
     // forbidding credentials. The redirect response fails the access check.
     async_test(t => {
-      runTest(t, "/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py",
+      runTest(t, "/xhr/resources/access-control-basic-allow-no-credentials.py",
           withCredentials, fails)
     }, "Request with credentials is redirected to a cross-origin response with a specific Access-Control-Allow-Origin (no credentials)");
     </script>
diff --git a/XMLHttpRequest/access-control-and-redirects-async.htm b/xhr/access-control-and-redirects-async.htm
similarity index 85%
rename from XMLHttpRequest/access-control-and-redirects-async.htm
rename to xhr/access-control-and-redirects-async.htm
index bf16c3c8a1cf1c..a77846f4f5f05c 100644
--- a/XMLHttpRequest/access-control-and-redirects-async.htm
+++ b/xhr/access-control-and-redirects-async.htm
@@ -11,7 +11,7 @@
     function runTest(test, destination, parameters, customHeader, local, expectSuccess) {
       const xhr = new XMLHttpRequest();
       const url = (local ? get_host_info().HTTP_ORIGIN : get_host_info().HTTP_REMOTE_ORIGIN) +
-        "/XMLHttpRequest/resources/redirect-cors.py?location=" + destination + "&" +  parameters;
+        "/xhr/resources/redirect-cors.py?location=" + destination + "&" +  parameters;
 
       xhr.open("GET", url, true);
 
@@ -41,21 +41,21 @@
     // The redirect response fails the access check because the redirect lacks a CORS header.
     async_test(t => {
       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "",
+          "/xhr/resources/access-control-basic-allow-star.py", "",
           withoutCustomHeader, remote, fails)
     }, "Request is redirected without CORS headers to a response with Access-Control-Allow-Origin=*");
 
     // The redirect response passes the access check.
     async_test(t => {
       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "allow_origin=true",
+          "/xhr/resources/access-control-basic-allow-star.py", "allow_origin=true",
           withoutCustomHeader, remote, succeeds)
     }, "Request is redirected to a response with Access-Control-Allow-Origin=*");
 
     // The redirect response fails the access check because user info was sent.
     async_test(t => {
       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN.replace("http://", "http://username:password@") +
-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py", "allow_origin=true",
+          "/xhr/resources/access-control-basic-allow-star.py", "allow_origin=true",
           withoutCustomHeader, remote, fails)
     }, "Request with user info is redirected to a response with Access-Control-Allow-Origin=*");
 
@@ -67,21 +67,21 @@
     // The preflighted redirect response fails the access check because of preflighting.
     async_test(t => {
       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
+          "/xhr/resources/access-control-basic-allow-star.py",
           "allow_origin=true&redirect_preflight=true", withCustomHeader, remote, fails)
     }, "Preflighted request is redirected to a response with Access-Control-Allow-Origin=*");
 
     // The preflighted redirect response fails the access check after successful preflighting.
     async_test(t => {
       runTest(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow-star.py",
+          "/xhr/resources/access-control-basic-allow-star.py",
           "allow_origin=true&allow_header=x-test&redirect_preflight=true",
           withCustomHeader, remote, fails)
     }, "Preflighted request is redirected to a response with Access-Control-Allow-Origin=* and header allowed");
 
     // The same-origin redirect response passes the access check.
     async_test(t => {
-      runTest(t, get_host_info().HTTP_ORIGIN + "/XMLHttpRequest/resources/pass.txt",
+      runTest(t, get_host_info().HTTP_ORIGIN + "/xhr/resources/pass.txt",
           "", withCustomHeader, local, succeeds)
     }, "Request is redirected to a same-origin resource file");
     </script>
diff --git a/XMLHttpRequest/access-control-and-redirects.htm b/xhr/access-control-and-redirects.htm
similarity index 66%
rename from XMLHttpRequest/access-control-and-redirects.htm
rename to xhr/access-control-and-redirects.htm
index dcdf40044cbd5f..a10bc1f5446355 100644
--- a/XMLHttpRequest/access-control-and-redirects.htm
+++ b/xhr/access-control-and-redirects.htm
@@ -29,31 +29,31 @@
     }
     test(t => {
       runSync(t, "resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py")
+          "/xhr/resources/access-control-basic-allow.py")
     }, "Local sync redirect to remote origin");
     async_test(t => {
       runAsync(t, "resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py")
+          "/xhr/resources/access-control-basic-allow.py")
     }, "Local async redirect to remote origin");
     test(t => {
       runSync(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
     }, "Remote sync redirect to local origin");
     async_test(t => {
       runAsync(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_ORIGIN +
+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
     }, "Remote async redirect to local origin");
     test(t => {
       runSync(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
     }, "Remote sync redirect to same remote origin");
     async_test(t => {
       runAsync(t, get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true")
+          "/xhr/resources/redirect-cors.py?location=" + get_host_info().HTTP_REMOTE_ORIGIN +
+          "/xhr/resources/access-control-basic-allow.py&allow_origin=true")
     }, "Remote async redirect to same remote origin");
     </script>
   </body>
diff --git a/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm b/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
similarity index 91%
rename from XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm
rename to xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
index d73f56b017b259..0d66ad787afbbf 100644
--- a/XMLHttpRequest/access-control-basic-allow-access-control-origin-header-data-url.htm
+++ b/xhr/access-control-basic-allow-access-control-origin-header-data-url.htm
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script type="text/javascript">
-const url = get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-origin-header.py";
+const url = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-origin-header.py";
 async_test(function(test) {
   window.addEventListener("message", test.step_func(function(evt) {
     if (evt.data == "ready") {
diff --git a/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm b/xhr/access-control-basic-allow-access-control-origin-header.htm
similarity index 82%
rename from XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm
rename to xhr/access-control-basic-allow-access-control-origin-header.htm
index 87b7e4755f930e..aedd20740eee2c 100644
--- a/XMLHttpRequest/access-control-basic-allow-access-control-origin-header.htm
+++ b/xhr/access-control-basic-allow-access-control-origin-header.htm
@@ -10,7 +10,7 @@
     async_test(function(test) {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-origin-header.py", false);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-origin-header.py", false);
       xhr.send();
 
       assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.\n" +
diff --git a/XMLHttpRequest/access-control-basic-allow-async.htm b/xhr/access-control-basic-allow-async.htm
similarity index 91%
rename from XMLHttpRequest/access-control-basic-allow-async.htm
rename to xhr/access-control-basic-allow-async.htm
index d9e03210d0c60e..142181e9ac0472 100644
--- a/XMLHttpRequest/access-control-basic-allow-async.htm
+++ b/xhr/access-control-basic-allow-async.htm
@@ -21,7 +21,7 @@
       xhr.onerror = test.unreached_func("FAIL: Network error.");
 
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-allow.py", true);
+          "/xhr/resources/access-control-basic-allow.py", true);
       xhr.send();
     }, "Basic async cross-origin XHR request");
     </script>
diff --git a/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm b/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
similarity index 92%
rename from XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm
rename to xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
index 57721aa684b9a8..e468c82ccab15e 100644
--- a/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method-async.htm
+++ b/xhr/access-control-basic-allow-non-cors-safelisted-method-async.htm
@@ -18,7 +18,7 @@
       xhr.onerror = test.unreached_func("Unexpected error.");
 
       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py");
+          "/xhr/resources/access-control-basic-put-allow.py");
       xhr.setRequestHeader("Content-Type", "text/plain; charset=UTF-8");
       xhr.send("PASS: PUT data received");
     }, "Allow async PUT request");
diff --git a/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm b/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
similarity index 83%
rename from XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm
rename to xhr/access-control-basic-allow-non-cors-safelisted-method.htm
index 08f41117f87935..2612265173eee1 100644
--- a/XMLHttpRequest/access-control-basic-allow-non-cors-safelisted-method.htm
+++ b/xhr/access-control-basic-allow-non-cors-safelisted-method.htm
@@ -11,7 +11,7 @@
     test(function() {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
+      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-put-allow.py", false);
 
       xhr.setRequestHeader("Content-Type", "text/plain; charset=UTF-8");
 
diff --git a/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm b/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
similarity index 75%
rename from XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
rename to xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
index 5a1e396e52f18d..306eb02b3eb55e 100644
--- a/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
+++ b/xhr/access-control-basic-allow-preflight-cache-invalidation-by-header.htm
@@ -20,7 +20,7 @@
         firstRequest();
       });
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
       xhr.send();
 
       function firstRequest() {
@@ -28,7 +28,7 @@
           assert_equals(xhr.responseText, "PASS: First PUT request.");
           secondRequest();
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
         xhr.send();
       }
 
@@ -38,7 +38,7 @@
           test.done();
         });
         // Send a header not included in the inital cache.
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
         xhr.setRequestHeader("x-test", "headerValue");
         xhr.send();
       }
diff --git a/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm b/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
similarity index 78%
rename from XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
rename to xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
index 058943e839d22d..f8a99a25560c41 100644
--- a/XMLHttpRequest/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
+++ b/xhr/access-control-basic-allow-preflight-cache-invalidation-by-method.htm
@@ -20,7 +20,7 @@
         firstRequest();
       });
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
       xhr.send();
 
       function firstRequest() {
@@ -28,7 +28,7 @@
           assert_equals(xhr.responseText, "PASS: First PUT request.");
           secondRequest();
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
         xhr.send();
       }
 
@@ -38,7 +38,7 @@
           test.done();
         });
         // Send a header not included in the inital cache.
-        xhr.open("XMETHOD", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
+        xhr.open("XMETHOD", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-invalidation.py?token=" + uuid, true);
         xhr.send();
       }
     }, "Preflight cache should be invalidated by changed method");
diff --git a/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm b/xhr/access-control-basic-allow-preflight-cache-timeout.htm
similarity index 74%
rename from XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm
rename to xhr/access-control-basic-allow-preflight-cache-timeout.htm
index 56702c01d0e886..ccd961f210834a 100644
--- a/XMLHttpRequest/access-control-basic-allow-preflight-cache-timeout.htm
+++ b/xhr/access-control-basic-allow-preflight-cache-timeout.htm
@@ -20,7 +20,7 @@
         firstRequest();
       });
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
       xhr.send();
 
       function firstRequest() {
@@ -28,7 +28,7 @@
           assert_equals(xhr.responseText, "PASS: First PUT request.");
           step_timeout(secondRequest, 3000); // 3 seconds
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
         xhr.send();
       }
 
@@ -37,7 +37,7 @@
           assert_equals(xhr.responseText, "PASS: Second OPTIONS request was sent.");
           test.done();
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache-timeout.py?token=" + uuid, true);
         xhr.send();
       }
     }, "Preflight cache should be invalidated on timeout");
diff --git a/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm b/xhr/access-control-basic-allow-preflight-cache.htm
similarity index 75%
rename from XMLHttpRequest/access-control-basic-allow-preflight-cache.htm
rename to xhr/access-control-basic-allow-preflight-cache.htm
index ad38a6bdb1d9a7..b8deda4349e080 100644
--- a/XMLHttpRequest/access-control-basic-allow-preflight-cache.htm
+++ b/xhr/access-control-basic-allow-preflight-cache.htm
@@ -20,7 +20,7 @@
         firstRequest();
       });
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, true);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/reset-token.py?token=" + uuid, true);
       xhr.send();
 
       function firstRequest() {
@@ -28,7 +28,7 @@
           assert_equals(xhr.responseText, "PASS: First PUT request.");
           secondRequest();
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
         xhr.send();
       }
 
@@ -36,7 +36,7 @@
         xhr.onload = test.step_func_done(function() {
           assert_equals(xhr.responseText, "PASS: Second PUT request. Preflight worked.");
         });
-        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
+        xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-preflight-cache.py?token=" + uuid, true);
         xhr.send();
       }
     }, "Preflight cache should allow second request");
diff --git a/XMLHttpRequest/access-control-basic-allow-star.htm b/xhr/access-control-basic-allow-star.htm
similarity index 80%
rename from XMLHttpRequest/access-control-basic-allow-star.htm
rename to xhr/access-control-basic-allow-star.htm
index fac25e297b5152..d05222f2002f22 100644
--- a/XMLHttpRequest/access-control-basic-allow-star.htm
+++ b/xhr/access-control-basic-allow-star.htm
@@ -11,7 +11,7 @@
     const xhr = new XMLHttpRequest;
 
     test(function(test) {
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-allow-star.py", false);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow-star.py", false);
 
       xhr.send();
 
diff --git a/XMLHttpRequest/access-control-basic-allow.htm b/xhr/access-control-basic-allow.htm
similarity index 81%
rename from XMLHttpRequest/access-control-basic-allow.htm
rename to xhr/access-control-basic-allow.htm
index f7e67babdf1ad5..61c02ed5428cc5 100644
--- a/XMLHttpRequest/access-control-basic-allow.htm
+++ b/xhr/access-control-basic-allow.htm
@@ -11,7 +11,7 @@
     test(function() {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-allow.py", false);
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-allow.py", false);
 
       xhr.send();
 
diff --git a/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm b/xhr/access-control-basic-cors-safelisted-request-headers.htm
similarity index 86%
rename from XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm
rename to xhr/access-control-basic-cors-safelisted-request-headers.htm
index 1d570a3c93ee36..20b875b9bddc3c 100644
--- a/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm
+++ b/xhr/access-control-basic-cors-safelisted-request-headers.htm
@@ -11,7 +11,7 @@
     test(function() {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py", false);
+      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-cors-safelisted-request-headers.py", false);
 
       xhr.setRequestHeader("Accept", "*");
       xhr.setRequestHeader("Accept-Language", "ru");
diff --git a/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm b/xhr/access-control-basic-cors-safelisted-response-headers.htm
similarity index 92%
rename from XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm
rename to xhr/access-control-basic-cors-safelisted-response-headers.htm
index c795083ece9912..a5c470b74f51d6 100644
--- a/XMLHttpRequest/access-control-basic-cors-safelisted-response-headers.htm
+++ b/xhr/access-control-basic-cors-safelisted-response-headers.htm
@@ -12,7 +12,7 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py", false);
+          "/xhr/resources/access-control-basic-whitelist-response-headers.py", false);
       xhr.send();
 
       assert_not_equals(xhr.getResponseHeader("cache-control"), null);
diff --git a/XMLHttpRequest/access-control-basic-denied.htm b/xhr/access-control-basic-denied.htm
similarity index 92%
rename from XMLHttpRequest/access-control-basic-denied.htm
rename to xhr/access-control-basic-denied.htm
index 924bdd55a6990d..3bcd2517245f5d 100644
--- a/XMLHttpRequest/access-control-basic-denied.htm
+++ b/xhr/access-control-basic-denied.htm
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script type="text/javascript">
-    const path = "/XMLHttpRequest/resources/access-control-basic-denied.py";
+    const path = "/xhr/resources/access-control-basic-denied.py";
 
     test(function() {
       const xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm b/xhr/access-control-basic-get-fail-non-simple.htm
similarity index 90%
rename from XMLHttpRequest/access-control-basic-get-fail-non-simple.htm
rename to xhr/access-control-basic-get-fail-non-simple.htm
index ccd9f7cab033f4..38f7a34d5a42ef 100644
--- a/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm
+++ b/xhr/access-control-basic-get-fail-non-simple.htm
@@ -12,7 +12,7 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
 
       // Non-CORS-safelisted header
       xhr.setRequestHeader("x-test", "foobar");
diff --git a/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm b/xhr/access-control-basic-non-cors-safelisted-content-type.htm
similarity index 87%
rename from XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm
rename to xhr/access-control-basic-non-cors-safelisted-content-type.htm
index bff0cf569c5607..b1cf9c8ac076d9 100644
--- a/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type.htm
+++ b/xhr/access-control-basic-non-cors-safelisted-content-type.htm
@@ -12,14 +12,14 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
+          "/xhr/resources/access-control-basic-put-allow.py", false);
       xhr.setRequestHeader("Content-Type", "text/plain");
       xhr.send("PASS: PUT data received");
 
       assert_equals(xhr.responseText, "PASS: Cross-domain access allowed.\nPASS: PUT data received");
 
       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-put-allow.py", false);
+          "/xhr/resources/access-control-basic-put-allow.py", false);
       xhr.setRequestHeader("Content-Type", "application/xml");
 
       try {
diff --git a/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm b/xhr/access-control-basic-post-success-no-content-type.htm
similarity index 84%
rename from XMLHttpRequest/access-control-basic-post-success-no-content-type.htm
rename to xhr/access-control-basic-post-success-no-content-type.htm
index 8785a44504b6ac..7e7a7d3a3e8191 100644
--- a/XMLHttpRequest/access-control-basic-post-success-no-content-type.htm
+++ b/xhr/access-control-basic-post-success-no-content-type.htm
@@ -11,7 +11,7 @@
     async_test(function(test) {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py");
+      xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-basic-options-not-supported.py");
 
       xhr.onerror = test.unreached_func("Network error.");
 
diff --git a/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm b/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
similarity index 87%
rename from XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm
rename to xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
index 9867c796d68dad..9b3bc54af21f38 100644
--- a/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm
+++ b/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
@@ -12,7 +12,7 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("POST", get_host_info().HTTP_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
 
       xhr.setRequestHeader("Content-Type", "application/xml");
 
@@ -25,7 +25,7 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("POST", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-options-not-supported.py", false);
+          "/xhr/resources/access-control-basic-options-not-supported.py", false);
 
       xhr.setRequestHeader("Content-Type", "application/xml");
 
diff --git a/XMLHttpRequest/access-control-basic-preflight-denied.htm b/xhr/access-control-basic-preflight-denied.htm
similarity index 93%
rename from XMLHttpRequest/access-control-basic-preflight-denied.htm
rename to xhr/access-control-basic-preflight-denied.htm
index d02bdf0dcdee49..6475186a068c2c 100644
--- a/XMLHttpRequest/access-control-basic-preflight-denied.htm
+++ b/xhr/access-control-basic-preflight-denied.htm
@@ -23,7 +23,7 @@
       xhr.onload = test.unreached_func("Request succeeded unexpectedly");
 
       xhr.open("FOO", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-basic-denied.py");
+          "/xhr/resources/access-control-basic-denied.py");
       xhr.send();
     });
     </script>
diff --git a/XMLHttpRequest/access-control-preflight-async-header-denied.htm b/xhr/access-control-preflight-async-header-denied.htm
similarity index 93%
rename from XMLHttpRequest/access-control-preflight-async-header-denied.htm
rename to xhr/access-control-preflight-async-header-denied.htm
index 84a60eb6f635fc..a00cc588981c37 100644
--- a/XMLHttpRequest/access-control-preflight-async-header-denied.htm
+++ b/xhr/access-control-preflight-async-header-denied.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
     const uuid = token();
     const url = get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+          "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
     async_test((test) => {
       let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-preflight-async-method-denied.htm b/xhr/access-control-preflight-async-method-denied.htm
similarity index 93%
rename from XMLHttpRequest/access-control-preflight-async-method-denied.htm
rename to xhr/access-control-preflight-async-method-denied.htm
index eb36110f4961a9..a0425a4bb1698e 100644
--- a/XMLHttpRequest/access-control-preflight-async-method-denied.htm
+++ b/xhr/access-control-preflight-async-method-denied.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
     const uuid = token();
     const url = get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+          "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
     async_test((test) => {
       let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-preflight-async-not-supported.htm b/xhr/access-control-preflight-async-not-supported.htm
similarity index 91%
rename from XMLHttpRequest/access-control-preflight-async-not-supported.htm
rename to xhr/access-control-preflight-async-not-supported.htm
index e1607d4389ae14..a4dc06d5515efe 100644
--- a/XMLHttpRequest/access-control-preflight-async-not-supported.htm
+++ b/xhr/access-control-preflight-async-not-supported.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
 const uuid = token();
 const url = get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
 async_test((test) => {
   let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-preflight-credential-async.htm b/xhr/access-control-preflight-credential-async.htm
similarity index 91%
rename from XMLHttpRequest/access-control-preflight-credential-async.htm
rename to xhr/access-control-preflight-credential-async.htm
index d9ccc102826342..ad7117fdf98b8f 100644
--- a/XMLHttpRequest/access-control-preflight-credential-async.htm
+++ b/xhr/access-control-preflight-credential-async.htm
@@ -12,7 +12,7 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-auth-basic.py?uid=fooUser",
+          "/xhr/resources/access-control-auth-basic.py?uid=fooUser",
           true, "fooUser", "barPass");
       xhr.withCredentials = true;
 
diff --git a/XMLHttpRequest/access-control-preflight-credential-sync.htm b/xhr/access-control-preflight-credential-sync.htm
similarity index 79%
rename from XMLHttpRequest/access-control-preflight-credential-sync.htm
rename to xhr/access-control-preflight-credential-sync.htm
index d0b99018160893..3844d023d9f567 100644
--- a/XMLHttpRequest/access-control-preflight-credential-sync.htm
+++ b/xhr/access-control-preflight-credential-sync.htm
@@ -11,7 +11,7 @@
     test(() => {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-auth-basic.py?uid=fooUser", false, "fooUser", "barPass");
+      xhr.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-auth-basic.py?uid=fooUser", false, "fooUser", "barPass");
 
       xhr.withCredentials = true;
 
diff --git a/XMLHttpRequest/access-control-preflight-headers-async.htm b/xhr/access-control-preflight-headers-async.htm
similarity index 85%
rename from XMLHttpRequest/access-control-preflight-headers-async.htm
rename to xhr/access-control-preflight-headers-async.htm
index 6e05cfe385c2ed..ffea72ac3b2db7 100644
--- a/XMLHttpRequest/access-control-preflight-headers-async.htm
+++ b/xhr/access-control-preflight-headers-async.htm
@@ -14,12 +14,12 @@
   const uuid = token();
 
   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, false);
+      "/xhr/resources/reset-token.py?token=" + uuid, false);
   xhr.send();
 
   xhr = new XMLHttpRequest;
   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/no-custom-header-on-preflight.py?token=" + uuid);
+      "/xhr/resources/no-custom-header-on-preflight.py?token=" + uuid);
   xhr.setRequestHeader("x-test", "foobar");
 
   xhr.onerror = test.unreached_func("Unexpected error");
diff --git a/XMLHttpRequest/access-control-preflight-headers-sync.htm b/xhr/access-control-preflight-headers-sync.htm
similarity index 83%
rename from XMLHttpRequest/access-control-preflight-headers-sync.htm
rename to xhr/access-control-preflight-headers-sync.htm
index 85fe446ceee82e..2ae9fe8002298d 100644
--- a/XMLHttpRequest/access-control-preflight-headers-sync.htm
+++ b/xhr/access-control-preflight-headers-sync.htm
@@ -14,12 +14,12 @@
       const uuid = token();
 
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/reset-token.py?token=" + uuid, false);
+          "/xhr/resources/reset-token.py?token=" + uuid, false);
       xhr.send();
 
       xhr = new XMLHttpRequest;
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/no-custom-header-on-preflight.py?token=" + uuid, false);
+          "/xhr/resources/no-custom-header-on-preflight.py?token=" + uuid, false);
       xhr.setRequestHeader("x-test", "foobar");
       xhr.send();
       assert_equals(xhr.responseText, "PASS");
diff --git a/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm b/xhr/access-control-preflight-request-header-lowercase.htm
similarity index 84%
rename from XMLHttpRequest/access-control-preflight-request-header-lowercase.htm
rename to xhr/access-control-preflight-request-header-lowercase.htm
index d88cac8f967024..7dc4608f57eb11 100644
--- a/XMLHttpRequest/access-control-preflight-request-header-lowercase.htm
+++ b/xhr/access-control-preflight-request-header-lowercase.htm
@@ -11,7 +11,7 @@
     async_test(function(test) {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py");
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-header-lowercase.py");
 
       xhr.setRequestHeader("X-Test", "foobar");
 
diff --git a/XMLHttpRequest/access-control-preflight-request-header-sorted.htm b/xhr/access-control-preflight-request-header-sorted.htm
similarity index 86%
rename from XMLHttpRequest/access-control-preflight-request-header-sorted.htm
rename to xhr/access-control-preflight-request-header-sorted.htm
index 2423b80cd8e223..830e0fbc4f496e 100644
--- a/XMLHttpRequest/access-control-preflight-request-header-sorted.htm
+++ b/xhr/access-control-preflight-request-header-sorted.htm
@@ -10,7 +10,7 @@
 <script>
 async_test((test) => {
   const xhr = new XMLHttpRequest();
-  const url = get_host_info().HTTP_REMOTE_ORIGIN + '/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py';
+  const url = get_host_info().HTTP_REMOTE_ORIGIN + '/xhr/resources/access-control-preflight-request-header-sorted.py';
   xhr.open('GET', url);
   xhr.setRequestHeader("X-Custom-Test", "foobar");
   xhr.setRequestHeader("X-Custom-ua", "foobar");
diff --git a/XMLHttpRequest/access-control-preflight-request-headers-origin.htm b/xhr/access-control-preflight-request-headers-origin.htm
similarity index 90%
rename from XMLHttpRequest/access-control-preflight-request-headers-origin.htm
rename to xhr/access-control-preflight-request-headers-origin.htm
index 67aeda9eeee828..fc11abc04fb000 100644
--- a/XMLHttpRequest/access-control-preflight-request-headers-origin.htm
+++ b/xhr/access-control-preflight-request-headers-origin.htm
@@ -11,7 +11,7 @@
 async_test((test) => {
   const xhr = new XMLHttpRequest;
   const url = get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py";
+      "/xhr/resources/access-control-preflight-request-headers-origin.py";
 
   xhr.open("GET", url);
   xhr.setRequestHeader("x-pass", "PASS");
diff --git a/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm b/xhr/access-control-preflight-request-invalid-status-301.htm
similarity index 83%
rename from XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm
rename to xhr/access-control-preflight-request-invalid-status-301.htm
index 669f7db80d2c57..62fc4803b4321d 100644
--- a/XMLHttpRequest/access-control-preflight-request-invalid-status-301.htm
+++ b/xhr/access-control-preflight-request-invalid-status-301.htm
@@ -11,7 +11,7 @@
     async_test((test) => {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=301");
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=301");
 
       xhr.setRequestHeader("x-pass", "pass");
 
diff --git a/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm b/xhr/access-control-preflight-request-invalid-status-400.htm
similarity index 83%
rename from XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm
rename to xhr/access-control-preflight-request-invalid-status-400.htm
index 38520999783c62..9e76d9e1308165 100644
--- a/XMLHttpRequest/access-control-preflight-request-invalid-status-400.htm
+++ b/xhr/access-control-preflight-request-invalid-status-400.htm
@@ -11,7 +11,7 @@
     async_test((test) => {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=400");
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=400");
 
       xhr.setRequestHeader("x-pass", "pass");
 
diff --git a/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm b/xhr/access-control-preflight-request-invalid-status-501.htm
similarity index 83%
rename from XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm
rename to xhr/access-control-preflight-request-invalid-status-501.htm
index 5f3c5e62c61180..f2ed85bc17e4e1 100644
--- a/XMLHttpRequest/access-control-preflight-request-invalid-status-501.htm
+++ b/xhr/access-control-preflight-request-invalid-status-501.htm
@@ -11,7 +11,7 @@
     async_test((test) => {
       const xhr = new XMLHttpRequest;
 
-      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=501");
+      xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/access-control-preflight-request-invalid-status.py?code=501");
 
       xhr.setRequestHeader("x-pass", "pass");
 
diff --git a/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm b/xhr/access-control-preflight-request-must-not-contain-cookie.htm
similarity index 87%
rename from XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm
rename to xhr/access-control-preflight-request-must-not-contain-cookie.htm
index c7cb5cde42aeac..6dd8e6db888c1a 100644
--- a/XMLHttpRequest/access-control-preflight-request-must-not-contain-cookie.htm
+++ b/xhr/access-control-preflight-request-must-not-contain-cookie.htm
@@ -13,7 +13,7 @@
         const xhr = new XMLHttpRequest;
         // Delete all preexisting cookies and set a cookie named "foo"
         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-            "/XMLHttpRequest/resources/access-control-cookie.py?cookie_name=foo");
+            "/xhr/resources/access-control-cookie.py?cookie_name=foo");
         xhr.withCredentials = true;
         xhr.send();
         xhr.onerror = test.unreached_func("Unexpected error.");
@@ -27,7 +27,7 @@
         const xhr = new XMLHttpRequest;
         // Request to server-side file fails if cookie is included in preflight
         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-          "/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py");
+          "/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py");
         xhr.withCredentials = true;
         xhr.setRequestHeader("X-Proprietary-Header", "foo");
         xhr.onerror = test.unreached_func("Unexpected error.");
@@ -43,7 +43,7 @@
         const xhr = new XMLHttpRequest;
         // Delete all cookies
         xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-            "/XMLHttpRequest/resources/access-control-cookie.py");
+            "/xhr/resources/access-control-cookie.py");
         xhr.withCredentials = true;
         xhr.send();
         xhr.onerror = test.unreached_func("Unexpected error.");
diff --git a/XMLHttpRequest/access-control-preflight-sync-header-denied.htm b/xhr/access-control-preflight-sync-header-denied.htm
similarity index 93%
rename from XMLHttpRequest/access-control-preflight-sync-header-denied.htm
rename to xhr/access-control-preflight-sync-header-denied.htm
index 422c625e99c38d..f400985b6beb8b 100644
--- a/XMLHttpRequest/access-control-preflight-sync-header-denied.htm
+++ b/xhr/access-control-preflight-sync-header-denied.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
 const uuid = token();
 const url = get_host_info().HTTP_REMOTE_ORIGIN +
-    "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+    "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
 test(() => {
   let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-preflight-sync-method-denied.htm b/xhr/access-control-preflight-sync-method-denied.htm
similarity index 92%
rename from XMLHttpRequest/access-control-preflight-sync-method-denied.htm
rename to xhr/access-control-preflight-sync-method-denied.htm
index cd2999a82a5a8c..021f9e37d6eede 100644
--- a/XMLHttpRequest/access-control-preflight-sync-method-denied.htm
+++ b/xhr/access-control-preflight-sync-method-denied.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
 const uuid = token();
 const url = get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
 test(() => {
   let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-preflight-sync-not-supported.htm b/xhr/access-control-preflight-sync-not-supported.htm
similarity index 91%
rename from XMLHttpRequest/access-control-preflight-sync-not-supported.htm
rename to xhr/access-control-preflight-sync-not-supported.htm
index a0b079e078913f..c5ff94bc8f6d5c 100644
--- a/XMLHttpRequest/access-control-preflight-sync-not-supported.htm
+++ b/xhr/access-control-preflight-sync-not-supported.htm
@@ -11,7 +11,7 @@
     <script type="text/javascript">
 const uuid = token();
 const url = get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/access-control-preflight-denied.py?token=" + uuid;
+      "/xhr/resources/access-control-preflight-denied.py?token=" + uuid;
 
 test(() => {
   let xhr = new XMLHttpRequest;
diff --git a/XMLHttpRequest/access-control-recursive-failed-request.htm b/xhr/access-control-recursive-failed-request.htm
similarity index 93%
rename from XMLHttpRequest/access-control-recursive-failed-request.htm
rename to xhr/access-control-recursive-failed-request.htm
index e29a34a6d03e6b..2c2bcef48b9d3b 100644
--- a/XMLHttpRequest/access-control-recursive-failed-request.htm
+++ b/xhr/access-control-recursive-failed-request.htm
@@ -27,7 +27,7 @@
     });
 
     xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-        "/XMLHttpRequest/resources/access-control-basic-denied.py");
+        "/xhr/resources/access-control-basic-denied.py");
     xhr.send();
   }
 
diff --git a/XMLHttpRequest/access-control-response-with-body-sync.htm b/xhr/access-control-response-with-body-sync.htm
similarity index 90%
rename from XMLHttpRequest/access-control-response-with-body-sync.htm
rename to xhr/access-control-response-with-body-sync.htm
index 559b7d21ad3430..d4c90aece062e5 100644
--- a/XMLHttpRequest/access-control-response-with-body-sync.htm
+++ b/xhr/access-control-response-with-body-sync.htm
@@ -12,7 +12,7 @@
   const xhr = new XMLHttpRequest;
 
   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN+
-      "/XMLHttpRequest/resources/access-control-allow-with-body.py", false);
+      "/xhr/resources/access-control-allow-with-body.py", false);
   xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
   xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
   xhr.send();
diff --git a/XMLHttpRequest/access-control-response-with-body.htm b/xhr/access-control-response-with-body.htm
similarity index 92%
rename from XMLHttpRequest/access-control-response-with-body.htm
rename to xhr/access-control-response-with-body.htm
index ab89cefd76ed2c..3ab0521106bd33 100644
--- a/XMLHttpRequest/access-control-response-with-body.htm
+++ b/xhr/access-control-response-with-body.htm
@@ -19,7 +19,7 @@
   });
 
   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/access-control-allow-with-body.py");
+      "/xhr/resources/access-control-allow-with-body.py");
   xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
   xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
   xhr.send();
diff --git a/XMLHttpRequest/access-control-response-with-exposed-headers.htm b/xhr/access-control-response-with-exposed-headers.htm
similarity index 95%
rename from XMLHttpRequest/access-control-response-with-exposed-headers.htm
rename to xhr/access-control-response-with-exposed-headers.htm
index 23cd0fbb1c886c..c6f7bf5c6a680b 100644
--- a/XMLHttpRequest/access-control-response-with-exposed-headers.htm
+++ b/xhr/access-control-response-with-exposed-headers.htm
@@ -12,7 +12,7 @@
   const xhr = new XMLHttpRequest;
 
   xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN +
-      "/XMLHttpRequest/resources/pass.txt?pipe=" +
+      "/xhr/resources/pass.txt?pipe=" +
       "header(Cache-Control,no-cache)|" +
       "header(Access-Control-Max-Age,0)|" +
       "header(Access-Control-Allow-Origin,*)|" +
diff --git a/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm b/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
similarity index 85%
rename from XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm
rename to xhr/access-control-sandboxed-iframe-allow-origin-null.htm
index 5c647dfa270d72..ae966683233ef3 100644
--- a/XMLHttpRequest/access-control-sandboxed-iframe-allow-origin-null.htm
+++ b/xhr/access-control-sandboxed-iframe-allow-origin-null.htm
@@ -13,7 +13,7 @@
     if (evt.data === "ready") {
       document.getElementById("frame").contentWindow.postMessage(
           get_host_info().HTTP_ORIGIN +
-          "/XMLHttpRequest/resources/pass.txt?pipe=" +
+          "/xhr/resources/pass.txt?pipe=" +
           "header(Cache-Control,no-store)|" +
           "header(Content-Type,text/plain)|" +
           "header(Access-Control-Allow-Credentials,true)|" +
@@ -26,7 +26,7 @@
   }), false);
 });
     </script>
-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
     </iframe>
   </body>
 </html>
diff --git a/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm b/xhr/access-control-sandboxed-iframe-allow.htm
similarity index 85%
rename from XMLHttpRequest/access-control-sandboxed-iframe-allow.htm
rename to xhr/access-control-sandboxed-iframe-allow.htm
index 21413f3866399b..a3dbed420feaf6 100644
--- a/XMLHttpRequest/access-control-sandboxed-iframe-allow.htm
+++ b/xhr/access-control-sandboxed-iframe-allow.htm
@@ -13,7 +13,7 @@
     if (evt.data === "ready") {
       document.getElementById("frame").contentWindow.postMessage(
           get_host_info().HTTP_ORIGIN +
-          "/XMLHttpRequest/resources/pass.txt?pipe=" +
+          "/xhr/resources/pass.txt?pipe=" +
           "header(Cache-Control,no-store)|" +
           "header(Content-Type,text/plain)|" +
           "header(Access-Control-Allow-Credentials,true)|" +
@@ -26,7 +26,7 @@
   }), false);
 });
     </script>
-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
     </iframe>
   </body>
 </html>
diff --git a/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm b/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
similarity index 89%
rename from XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm
rename to xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
index 7c375f606684b6..a703a922e27344 100644
--- a/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard.htm
+++ b/xhr/access-control-sandboxed-iframe-denied-without-wildcard.htm
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script type="text/javascript">
-const path = "/XMLHttpRequest/resources/pass.txt?pipe=" +
+const path = "/xhr/resources/pass.txt?pipe=" +
     "header(Cache-Control,no-store)|" +
     "header(Content-Type,text/plain)" +
     "header(Access-Control-Allow-Credentials,true)|" +
@@ -37,7 +37,7 @@
   }), false);
 }, "Sandboxed iframe is denied CORS access to server that allows parent origin");
     </script>
-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
     </iframe>
   </body>
 </html>
diff --git a/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm b/xhr/access-control-sandboxed-iframe-denied.htm
similarity index 88%
rename from XMLHttpRequest/access-control-sandboxed-iframe-denied.htm
rename to xhr/access-control-sandboxed-iframe-denied.htm
index a87dd7d1f25548..5b629917041f5f 100644
--- a/XMLHttpRequest/access-control-sandboxed-iframe-denied.htm
+++ b/xhr/access-control-sandboxed-iframe-denied.htm
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script type="text/javascript">
-const path = "/XMLHttpRequest/resources/pass.txt?pipe=" +
+const path = "/xhr/resources/pass.txt?pipe=" +
     "header(Cache-Control,no-store)|" +
     "header(Content-Type,text/plain)";
 
@@ -35,7 +35,7 @@
   }), false);
 }, "Sandboxed iframe is denied access to path");
     </script>
-    <iframe id="frame" sandbox="allow-scripts" src="/XMLHttpRequest/resources/access-control-sandboxed-iframe.html">
+    <iframe id="frame" sandbox="allow-scripts" src="/xhr/resources/access-control-sandboxed-iframe.html">
     </iframe>
   </body>
 </html>
diff --git a/XMLHttpRequest/allow-lists-starting-with-comma.htm b/xhr/allow-lists-starting-with-comma.htm
similarity index 84%
rename from XMLHttpRequest/allow-lists-starting-with-comma.htm
rename to xhr/allow-lists-starting-with-comma.htm
index 4a4e5e2218c731..ece699bf5d75f1 100644
--- a/XMLHttpRequest/allow-lists-starting-with-comma.htm
+++ b/xhr/allow-lists-starting-with-comma.htm
@@ -10,7 +10,7 @@
   <script type="text/javascript">
     async_test(function(test) {
       const client = new XMLHttpRequest();
-      let url = "XMLHttpRequest/resources/access-control-allow-lists.py?headers=,y-lol,x-print,%20,,,y-print&origin=" +
+      let url = "xhr/resources/access-control-allow-lists.py?headers=,y-lol,x-print,%20,,,y-print&origin=" +
           get_host_info().HTTP_ORIGIN;
       client.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + '/' + url, false);
       client.setRequestHeader('x-print', 'unicorn')
@@ -21,7 +21,7 @@
       assert_equals(response['x-print'], "unicorn");
       assert_equals(response['y-print'], "narwhal");
 
-      url = "XMLHttpRequest/resources/access-control-allow-lists.py?methods=,,PUT,GET&origin=" +
+      url = "xhr/resources/access-control-allow-lists.py?methods=,,PUT,GET&origin=" +
           get_host_info().HTTP_ORIGIN;
       client.open("PUT", get_host_info().HTTP_REMOTE_ORIGIN + '/' + url, false);
       // Sending PUT request
diff --git a/XMLHttpRequest/anonymous-mode-unsupported.htm b/xhr/anonymous-mode-unsupported.htm
similarity index 100%
rename from XMLHttpRequest/anonymous-mode-unsupported.htm
rename to xhr/anonymous-mode-unsupported.htm
diff --git a/XMLHttpRequest/data-uri.htm b/xhr/data-uri.htm
similarity index 100%
rename from XMLHttpRequest/data-uri.htm
rename to xhr/data-uri.htm
diff --git a/XMLHttpRequest/event-abort.htm b/xhr/event-abort.htm
similarity index 100%
rename from XMLHttpRequest/event-abort.htm
rename to xhr/event-abort.htm
diff --git a/XMLHttpRequest/event-error-order.sub.html b/xhr/event-error-order.sub.html
similarity index 100%
rename from XMLHttpRequest/event-error-order.sub.html
rename to xhr/event-error-order.sub.html
diff --git a/XMLHttpRequest/event-error.sub.html b/xhr/event-error.sub.html
similarity index 100%
rename from XMLHttpRequest/event-error.sub.html
rename to xhr/event-error.sub.html
diff --git a/XMLHttpRequest/event-load.htm b/xhr/event-load.htm
similarity index 100%
rename from XMLHttpRequest/event-load.htm
rename to xhr/event-load.htm
diff --git a/XMLHttpRequest/event-loadend.htm b/xhr/event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/event-loadend.htm
rename to xhr/event-loadend.htm
diff --git a/XMLHttpRequest/event-loadstart-upload.htm b/xhr/event-loadstart-upload.htm
similarity index 100%
rename from XMLHttpRequest/event-loadstart-upload.htm
rename to xhr/event-loadstart-upload.htm
diff --git a/XMLHttpRequest/event-loadstart.htm b/xhr/event-loadstart.htm
similarity index 100%
rename from XMLHttpRequest/event-loadstart.htm
rename to xhr/event-loadstart.htm
diff --git a/XMLHttpRequest/event-progress.htm b/xhr/event-progress.htm
similarity index 100%
rename from XMLHttpRequest/event-progress.htm
rename to xhr/event-progress.htm
diff --git a/XMLHttpRequest/event-readystate-sync-open.htm b/xhr/event-readystate-sync-open.htm
similarity index 100%
rename from XMLHttpRequest/event-readystate-sync-open.htm
rename to xhr/event-readystate-sync-open.htm
diff --git a/XMLHttpRequest/event-readystatechange-loaded.htm b/xhr/event-readystatechange-loaded.htm
similarity index 100%
rename from XMLHttpRequest/event-readystatechange-loaded.htm
rename to xhr/event-readystatechange-loaded.htm
diff --git a/XMLHttpRequest/event-timeout-order.htm b/xhr/event-timeout-order.htm
similarity index 100%
rename from XMLHttpRequest/event-timeout-order.htm
rename to xhr/event-timeout-order.htm
diff --git a/XMLHttpRequest/event-timeout.htm b/xhr/event-timeout.htm
similarity index 100%
rename from XMLHttpRequest/event-timeout.htm
rename to xhr/event-timeout.htm
diff --git a/XMLHttpRequest/event-upload-progress-crossorigin.htm b/xhr/event-upload-progress-crossorigin.htm
similarity index 92%
rename from XMLHttpRequest/event-upload-progress-crossorigin.htm
rename to xhr/event-upload-progress-crossorigin.htm
index 293f7bf2b9cdff..5e558a27b78b18 100644
--- a/XMLHttpRequest/event-upload-progress-crossorigin.htm
+++ b/xhr/event-upload-progress-crossorigin.htm
@@ -7,7 +7,7 @@
 <script src="/common/get-host-info.sub.js"></script>
 <div id="log"></div>
 <script>
-const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/corsenabled.py",
+const remote = get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/corsenabled.py",
       redirect = "resources/redirect.py?code=307&location=" + remote;
 
 [remote, redirect].forEach(url => {
diff --git a/XMLHttpRequest/event-upload-progress.htm b/xhr/event-upload-progress.htm
similarity index 100%
rename from XMLHttpRequest/event-upload-progress.htm
rename to xhr/event-upload-progress.htm
diff --git a/XMLHttpRequest/firing-events-http-content-length.html b/xhr/firing-events-http-content-length.html
similarity index 100%
rename from XMLHttpRequest/firing-events-http-content-length.html
rename to xhr/firing-events-http-content-length.html
diff --git a/XMLHttpRequest/firing-events-http-no-content-length.html b/xhr/firing-events-http-no-content-length.html
similarity index 100%
rename from XMLHttpRequest/firing-events-http-no-content-length.html
rename to xhr/firing-events-http-no-content-length.html
diff --git a/XMLHttpRequest/folder.txt b/xhr/folder.txt
similarity index 100%
rename from XMLHttpRequest/folder.txt
rename to xhr/folder.txt
diff --git a/XMLHttpRequest/formdata-blob.htm b/xhr/formdata-blob.htm
similarity index 100%
rename from XMLHttpRequest/formdata-blob.htm
rename to xhr/formdata-blob.htm
diff --git a/XMLHttpRequest/formdata-delete.htm b/xhr/formdata-delete.htm
similarity index 100%
rename from XMLHttpRequest/formdata-delete.htm
rename to xhr/formdata-delete.htm
diff --git a/XMLHttpRequest/formdata-foreach.html b/xhr/formdata-foreach.html
similarity index 100%
rename from XMLHttpRequest/formdata-foreach.html
rename to xhr/formdata-foreach.html
diff --git a/XMLHttpRequest/formdata-get.htm b/xhr/formdata-get.htm
similarity index 100%
rename from XMLHttpRequest/formdata-get.htm
rename to xhr/formdata-get.htm
diff --git a/XMLHttpRequest/formdata-has.htm b/xhr/formdata-has.htm
similarity index 100%
rename from XMLHttpRequest/formdata-has.htm
rename to xhr/formdata-has.htm
diff --git a/XMLHttpRequest/formdata-set.htm b/xhr/formdata-set.htm
similarity index 100%
rename from XMLHttpRequest/formdata-set.htm
rename to xhr/formdata-set.htm
diff --git a/XMLHttpRequest/formdata.htm b/xhr/formdata.htm
similarity index 100%
rename from XMLHttpRequest/formdata.htm
rename to xhr/formdata.htm
diff --git a/XMLHttpRequest/getallresponseheaders-cookies.htm b/xhr/getallresponseheaders-cookies.htm
similarity index 100%
rename from XMLHttpRequest/getallresponseheaders-cookies.htm
rename to xhr/getallresponseheaders-cookies.htm
diff --git a/XMLHttpRequest/getallresponseheaders-status.htm b/xhr/getallresponseheaders-status.htm
similarity index 100%
rename from XMLHttpRequest/getallresponseheaders-status.htm
rename to xhr/getallresponseheaders-status.htm
diff --git a/XMLHttpRequest/getallresponseheaders.htm b/xhr/getallresponseheaders.htm
similarity index 100%
rename from XMLHttpRequest/getallresponseheaders.htm
rename to xhr/getallresponseheaders.htm
diff --git a/XMLHttpRequest/getresponseheader-case-insensitive.htm b/xhr/getresponseheader-case-insensitive.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-case-insensitive.htm
rename to xhr/getresponseheader-case-insensitive.htm
diff --git a/XMLHttpRequest/getresponseheader-chunked-trailer.htm b/xhr/getresponseheader-chunked-trailer.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-chunked-trailer.htm
rename to xhr/getresponseheader-chunked-trailer.htm
diff --git a/XMLHttpRequest/getresponseheader-cookies-and-more.htm b/xhr/getresponseheader-cookies-and-more.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-cookies-and-more.htm
rename to xhr/getresponseheader-cookies-and-more.htm
diff --git a/XMLHttpRequest/getresponseheader-error-state.htm b/xhr/getresponseheader-error-state.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-error-state.htm
rename to xhr/getresponseheader-error-state.htm
diff --git a/XMLHttpRequest/getresponseheader-server-date.htm b/xhr/getresponseheader-server-date.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-server-date.htm
rename to xhr/getresponseheader-server-date.htm
diff --git a/XMLHttpRequest/getresponseheader-special-characters.htm b/xhr/getresponseheader-special-characters.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-special-characters.htm
rename to xhr/getresponseheader-special-characters.htm
diff --git a/XMLHttpRequest/getresponseheader-unsent-opened-state.htm b/xhr/getresponseheader-unsent-opened-state.htm
similarity index 100%
rename from XMLHttpRequest/getresponseheader-unsent-opened-state.htm
rename to xhr/getresponseheader-unsent-opened-state.htm
diff --git a/XMLHttpRequest/headers-normalize-response.htm b/xhr/headers-normalize-response.htm
similarity index 100%
rename from XMLHttpRequest/headers-normalize-response.htm
rename to xhr/headers-normalize-response.htm
diff --git a/XMLHttpRequest/historical.html b/xhr/historical.html
similarity index 100%
rename from XMLHttpRequest/historical.html
rename to xhr/historical.html
diff --git a/XMLHttpRequest/interfaces.html b/xhr/interfaces.html
similarity index 100%
rename from XMLHttpRequest/interfaces.html
rename to xhr/interfaces.html
diff --git a/XMLHttpRequest/loadstart-and-state.html b/xhr/loadstart-and-state.html
similarity index 100%
rename from XMLHttpRequest/loadstart-and-state.html
rename to xhr/loadstart-and-state.html
diff --git a/XMLHttpRequest/no-utf16-json.htm b/xhr/no-utf16-json.htm
similarity index 100%
rename from XMLHttpRequest/no-utf16-json.htm
rename to xhr/no-utf16-json.htm
diff --git a/XMLHttpRequest/open-after-abort.htm b/xhr/open-after-abort.htm
similarity index 100%
rename from XMLHttpRequest/open-after-abort.htm
rename to xhr/open-after-abort.htm
diff --git a/XMLHttpRequest/open-after-setrequestheader.htm b/xhr/open-after-setrequestheader.htm
similarity index 100%
rename from XMLHttpRequest/open-after-setrequestheader.htm
rename to xhr/open-after-setrequestheader.htm
diff --git a/XMLHttpRequest/open-during-abort-event.htm b/xhr/open-during-abort-event.htm
similarity index 100%
rename from XMLHttpRequest/open-during-abort-event.htm
rename to xhr/open-during-abort-event.htm
diff --git a/XMLHttpRequest/open-during-abort-processing.htm b/xhr/open-during-abort-processing.htm
similarity index 100%
rename from XMLHttpRequest/open-during-abort-processing.htm
rename to xhr/open-during-abort-processing.htm
diff --git a/XMLHttpRequest/open-during-abort.htm b/xhr/open-during-abort.htm
similarity index 100%
rename from XMLHttpRequest/open-during-abort.htm
rename to xhr/open-during-abort.htm
diff --git a/XMLHttpRequest/open-method-bogus.htm b/xhr/open-method-bogus.htm
similarity index 100%
rename from XMLHttpRequest/open-method-bogus.htm
rename to xhr/open-method-bogus.htm
diff --git a/XMLHttpRequest/open-method-case-insensitive.htm b/xhr/open-method-case-insensitive.htm
similarity index 100%
rename from XMLHttpRequest/open-method-case-insensitive.htm
rename to xhr/open-method-case-insensitive.htm
diff --git a/XMLHttpRequest/open-method-case-sensitive.htm b/xhr/open-method-case-sensitive.htm
similarity index 100%
rename from XMLHttpRequest/open-method-case-sensitive.htm
rename to xhr/open-method-case-sensitive.htm
diff --git a/XMLHttpRequest/open-method-insecure.htm b/xhr/open-method-insecure.htm
similarity index 100%
rename from XMLHttpRequest/open-method-insecure.htm
rename to xhr/open-method-insecure.htm
diff --git a/XMLHttpRequest/open-method-responsetype-set-sync.htm b/xhr/open-method-responsetype-set-sync.htm
similarity index 100%
rename from XMLHttpRequest/open-method-responsetype-set-sync.htm
rename to xhr/open-method-responsetype-set-sync.htm
diff --git a/XMLHttpRequest/open-open-send.htm b/xhr/open-open-send.htm
similarity index 100%
rename from XMLHttpRequest/open-open-send.htm
rename to xhr/open-open-send.htm
diff --git a/XMLHttpRequest/open-open-sync-send.htm b/xhr/open-open-sync-send.htm
similarity index 100%
rename from XMLHttpRequest/open-open-sync-send.htm
rename to xhr/open-open-sync-send.htm
diff --git a/XMLHttpRequest/open-referer.htm b/xhr/open-referer.htm
similarity index 100%
rename from XMLHttpRequest/open-referer.htm
rename to xhr/open-referer.htm
diff --git a/XMLHttpRequest/open-send-during-abort.htm b/xhr/open-send-during-abort.htm
similarity index 100%
rename from XMLHttpRequest/open-send-during-abort.htm
rename to xhr/open-send-during-abort.htm
diff --git a/XMLHttpRequest/open-send-open.htm b/xhr/open-send-open.htm
similarity index 100%
rename from XMLHttpRequest/open-send-open.htm
rename to xhr/open-send-open.htm
diff --git a/XMLHttpRequest/open-sync-open-send.htm b/xhr/open-sync-open-send.htm
similarity index 100%
rename from XMLHttpRequest/open-sync-open-send.htm
rename to xhr/open-sync-open-send.htm
diff --git a/XMLHttpRequest/open-url-about-blank-window.htm b/xhr/open-url-about-blank-window.htm
similarity index 100%
rename from XMLHttpRequest/open-url-about-blank-window.htm
rename to xhr/open-url-about-blank-window.htm
diff --git a/XMLHttpRequest/open-url-base-inserted-after-open.htm b/xhr/open-url-base-inserted-after-open.htm
similarity index 100%
rename from XMLHttpRequest/open-url-base-inserted-after-open.htm
rename to xhr/open-url-base-inserted-after-open.htm
diff --git a/XMLHttpRequest/open-url-base-inserted.htm b/xhr/open-url-base-inserted.htm
similarity index 100%
rename from XMLHttpRequest/open-url-base-inserted.htm
rename to xhr/open-url-base-inserted.htm
diff --git a/XMLHttpRequest/open-url-base.htm b/xhr/open-url-base.htm
similarity index 100%
rename from XMLHttpRequest/open-url-base.htm
rename to xhr/open-url-base.htm
diff --git a/XMLHttpRequest/open-url-encoding.htm b/xhr/open-url-encoding.htm
similarity index 100%
rename from XMLHttpRequest/open-url-encoding.htm
rename to xhr/open-url-encoding.htm
diff --git a/XMLHttpRequest/open-url-fragment.htm b/xhr/open-url-fragment.htm
similarity index 82%
rename from XMLHttpRequest/open-url-fragment.htm
rename to xhr/open-url-fragment.htm
index 6b3fdeb8ae85e2..03f4016797cdfc 100644
--- a/XMLHttpRequest/open-url-fragment.htm
+++ b/xhr/open-url-fragment.htm
@@ -19,19 +19,19 @@
         var client = new XMLHttpRequest()
         client.open("GET", "resources/requri.py#foobar", false)
         client.send(null)
-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py$/)
+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py$/)
       }, 'make sure fragment is removed from URL before request')
       test(function() {
         var client = new XMLHttpRequest()
         client.open("GET", "resources/requri.py?help=#foobar", false)
         client.send(null)
-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py\?help=$/)
+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py\?help=$/)
       }, 'make sure fragment is removed from URL before request (with query string)')
       test(function() {
         var client = new XMLHttpRequest()
         client.open("GET", "resources/requri.py?" +encodeURIComponent("#foobar"), false)
         client.send(null)
-        assert_regexp_match(client.responseText, /XMLHttpRequest\/resources\/requri\.py\?%23foobar$/)
+        assert_regexp_match(client.responseText, /xhr\/resources\/requri\.py\?%23foobar$/)
       }, 'make sure escaped # is not removed')
     </script>
   </body>
diff --git a/XMLHttpRequest/open-url-javascript-window-2.htm b/xhr/open-url-javascript-window-2.htm
similarity index 100%
rename from XMLHttpRequest/open-url-javascript-window-2.htm
rename to xhr/open-url-javascript-window-2.htm
diff --git a/XMLHttpRequest/open-url-javascript-window.htm b/xhr/open-url-javascript-window.htm
similarity index 100%
rename from XMLHttpRequest/open-url-javascript-window.htm
rename to xhr/open-url-javascript-window.htm
diff --git a/XMLHttpRequest/open-url-multi-window-2.htm b/xhr/open-url-multi-window-2.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window-2.htm
rename to xhr/open-url-multi-window-2.htm
diff --git a/XMLHttpRequest/open-url-multi-window-3.htm b/xhr/open-url-multi-window-3.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window-3.htm
rename to xhr/open-url-multi-window-3.htm
diff --git a/XMLHttpRequest/open-url-multi-window-4.htm b/xhr/open-url-multi-window-4.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window-4.htm
rename to xhr/open-url-multi-window-4.htm
diff --git a/XMLHttpRequest/open-url-multi-window-5.htm b/xhr/open-url-multi-window-5.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window-5.htm
rename to xhr/open-url-multi-window-5.htm
diff --git a/XMLHttpRequest/open-url-multi-window-6.htm b/xhr/open-url-multi-window-6.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window-6.htm
rename to xhr/open-url-multi-window-6.htm
diff --git a/XMLHttpRequest/open-url-multi-window.htm b/xhr/open-url-multi-window.htm
similarity index 100%
rename from XMLHttpRequest/open-url-multi-window.htm
rename to xhr/open-url-multi-window.htm
diff --git a/XMLHttpRequest/open-url-redirected-worker-origin.htm b/xhr/open-url-redirected-worker-origin.htm
similarity index 100%
rename from XMLHttpRequest/open-url-redirected-worker-origin.htm
rename to xhr/open-url-redirected-worker-origin.htm
diff --git a/XMLHttpRequest/open-url-worker-origin.htm b/xhr/open-url-worker-origin.htm
similarity index 100%
rename from XMLHttpRequest/open-url-worker-origin.htm
rename to xhr/open-url-worker-origin.htm
diff --git a/XMLHttpRequest/open-url-worker-simple.htm b/xhr/open-url-worker-simple.htm
similarity index 100%
rename from XMLHttpRequest/open-url-worker-simple.htm
rename to xhr/open-url-worker-simple.htm
diff --git a/XMLHttpRequest/open-user-password-non-same-origin.htm b/xhr/open-user-password-non-same-origin.htm
similarity index 100%
rename from XMLHttpRequest/open-user-password-non-same-origin.htm
rename to xhr/open-user-password-non-same-origin.htm
diff --git a/XMLHttpRequest/overridemimetype-blob.html b/xhr/overridemimetype-blob.html
similarity index 100%
rename from XMLHttpRequest/overridemimetype-blob.html
rename to xhr/overridemimetype-blob.html
diff --git a/XMLHttpRequest/overridemimetype-done-state.htm b/xhr/overridemimetype-done-state.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-done-state.htm
rename to xhr/overridemimetype-done-state.htm
diff --git a/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm b/xhr/overridemimetype-headers-received-state-force-shiftjis.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
rename to xhr/overridemimetype-headers-received-state-force-shiftjis.htm
diff --git a/XMLHttpRequest/overridemimetype-invalid-mime-type.htm b/xhr/overridemimetype-invalid-mime-type.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-invalid-mime-type.htm
rename to xhr/overridemimetype-invalid-mime-type.htm
diff --git a/XMLHttpRequest/overridemimetype-loading-state.htm b/xhr/overridemimetype-loading-state.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-loading-state.htm
rename to xhr/overridemimetype-loading-state.htm
diff --git a/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm b/xhr/overridemimetype-open-state-force-utf-8.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm
rename to xhr/overridemimetype-open-state-force-utf-8.htm
diff --git a/XMLHttpRequest/overridemimetype-open-state-force-xml.htm b/xhr/overridemimetype-open-state-force-xml.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-open-state-force-xml.htm
rename to xhr/overridemimetype-open-state-force-xml.htm
diff --git a/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm b/xhr/overridemimetype-unsent-state-force-shiftjis.htm
similarity index 100%
rename from XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm
rename to xhr/overridemimetype-unsent-state-force-shiftjis.htm
diff --git a/XMLHttpRequest/preserve-ua-header-on-redirect.htm b/xhr/preserve-ua-header-on-redirect.htm
similarity index 100%
rename from XMLHttpRequest/preserve-ua-header-on-redirect.htm
rename to xhr/preserve-ua-header-on-redirect.htm
diff --git a/XMLHttpRequest/progress-events-response-data-gzip.htm b/xhr/progress-events-response-data-gzip.htm
similarity index 100%
rename from XMLHttpRequest/progress-events-response-data-gzip.htm
rename to xhr/progress-events-response-data-gzip.htm
diff --git a/XMLHttpRequest/progressevent-constructor.html b/xhr/progressevent-constructor.html
similarity index 100%
rename from XMLHttpRequest/progressevent-constructor.html
rename to xhr/progressevent-constructor.html
diff --git a/XMLHttpRequest/progressevent-interface.html b/xhr/progressevent-interface.html
similarity index 100%
rename from XMLHttpRequest/progressevent-interface.html
rename to xhr/progressevent-interface.html
diff --git a/XMLHttpRequest/resources/accept-language.py b/xhr/resources/accept-language.py
similarity index 100%
rename from XMLHttpRequest/resources/accept-language.py
rename to xhr/resources/accept-language.py
diff --git a/XMLHttpRequest/resources/accept.py b/xhr/resources/accept.py
similarity index 100%
rename from XMLHttpRequest/resources/accept.py
rename to xhr/resources/accept.py
diff --git a/XMLHttpRequest/resources/access-control-allow-lists.py b/xhr/resources/access-control-allow-lists.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-allow-lists.py
rename to xhr/resources/access-control-allow-lists.py
diff --git a/XMLHttpRequest/resources/access-control-allow-with-body.py b/xhr/resources/access-control-allow-with-body.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-allow-with-body.py
rename to xhr/resources/access-control-allow-with-body.py
diff --git a/XMLHttpRequest/resources/access-control-auth-basic.py b/xhr/resources/access-control-auth-basic.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-auth-basic.py
rename to xhr/resources/access-control-auth-basic.py
diff --git a/XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py b/xhr/resources/access-control-basic-allow-no-credentials.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-allow-no-credentials.py
rename to xhr/resources/access-control-basic-allow-no-credentials.py
diff --git a/XMLHttpRequest/resources/access-control-basic-allow-star.py b/xhr/resources/access-control-basic-allow-star.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-allow-star.py
rename to xhr/resources/access-control-basic-allow-star.py
diff --git a/XMLHttpRequest/resources/access-control-basic-allow.py b/xhr/resources/access-control-basic-allow.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-allow.py
rename to xhr/resources/access-control-basic-allow.py
diff --git a/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py b/xhr/resources/access-control-basic-cors-safelisted-request-headers.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py
rename to xhr/resources/access-control-basic-cors-safelisted-request-headers.py
diff --git a/XMLHttpRequest/resources/access-control-basic-denied.py b/xhr/resources/access-control-basic-denied.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-denied.py
rename to xhr/resources/access-control-basic-denied.py
diff --git a/XMLHttpRequest/resources/access-control-basic-options-not-supported.py b/xhr/resources/access-control-basic-options-not-supported.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-options-not-supported.py
rename to xhr/resources/access-control-basic-options-not-supported.py
diff --git a/XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py b/xhr/resources/access-control-basic-preflight-cache-invalidation.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-preflight-cache-invalidation.py
rename to xhr/resources/access-control-basic-preflight-cache-invalidation.py
diff --git a/XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py b/xhr/resources/access-control-basic-preflight-cache-timeout.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-preflight-cache-timeout.py
rename to xhr/resources/access-control-basic-preflight-cache-timeout.py
diff --git a/XMLHttpRequest/resources/access-control-basic-preflight-cache.py b/xhr/resources/access-control-basic-preflight-cache.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-preflight-cache.py
rename to xhr/resources/access-control-basic-preflight-cache.py
diff --git a/XMLHttpRequest/resources/access-control-basic-put-allow.py b/xhr/resources/access-control-basic-put-allow.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-put-allow.py
rename to xhr/resources/access-control-basic-put-allow.py
diff --git a/XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py b/xhr/resources/access-control-basic-whitelist-response-headers.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-basic-whitelist-response-headers.py
rename to xhr/resources/access-control-basic-whitelist-response-headers.py
diff --git a/XMLHttpRequest/resources/access-control-cookie.py b/xhr/resources/access-control-cookie.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-cookie.py
rename to xhr/resources/access-control-cookie.py
diff --git a/XMLHttpRequest/resources/access-control-origin-header.py b/xhr/resources/access-control-origin-header.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-origin-header.py
rename to xhr/resources/access-control-origin-header.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-denied.py b/xhr/resources/access-control-preflight-denied.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-denied.py
rename to xhr/resources/access-control-preflight-denied.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py b/xhr/resources/access-control-preflight-request-header-lowercase.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-request-header-lowercase.py
rename to xhr/resources/access-control-preflight-request-header-lowercase.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py b/xhr/resources/access-control-preflight-request-header-sorted.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-request-header-sorted.py
rename to xhr/resources/access-control-preflight-request-header-sorted.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py b/xhr/resources/access-control-preflight-request-headers-origin.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-request-headers-origin.py
rename to xhr/resources/access-control-preflight-request-headers-origin.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py b/xhr/resources/access-control-preflight-request-invalid-status.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py
rename to xhr/resources/access-control-preflight-request-invalid-status.py
diff --git a/XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py b/xhr/resources/access-control-preflight-request-must-not-contain-cookie.py
similarity index 100%
rename from XMLHttpRequest/resources/access-control-preflight-request-must-not-contain-cookie.py
rename to xhr/resources/access-control-preflight-request-must-not-contain-cookie.py
diff --git a/XMLHttpRequest/resources/access-control-sandboxed-iframe.html b/xhr/resources/access-control-sandboxed-iframe.html
similarity index 100%
rename from XMLHttpRequest/resources/access-control-sandboxed-iframe.html
rename to xhr/resources/access-control-sandboxed-iframe.html
diff --git a/XMLHttpRequest/resources/auth1/auth.py b/xhr/resources/auth1/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth1/auth.py
rename to xhr/resources/auth1/auth.py
diff --git a/XMLHttpRequest/resources/auth2/auth.py b/xhr/resources/auth2/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth2/auth.py
rename to xhr/resources/auth2/auth.py
diff --git a/XMLHttpRequest/resources/auth2/corsenabled.py b/xhr/resources/auth2/corsenabled.py
similarity index 100%
rename from XMLHttpRequest/resources/auth2/corsenabled.py
rename to xhr/resources/auth2/corsenabled.py
diff --git a/XMLHttpRequest/resources/auth3/auth.py b/xhr/resources/auth3/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth3/auth.py
rename to xhr/resources/auth3/auth.py
diff --git a/XMLHttpRequest/resources/auth4/auth.py b/xhr/resources/auth4/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth4/auth.py
rename to xhr/resources/auth4/auth.py
diff --git a/XMLHttpRequest/resources/auth5/auth.py b/xhr/resources/auth5/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth5/auth.py
rename to xhr/resources/auth5/auth.py
diff --git a/XMLHttpRequest/resources/auth6/auth.py b/xhr/resources/auth6/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth6/auth.py
rename to xhr/resources/auth6/auth.py
diff --git a/XMLHttpRequest/resources/auth7/corsenabled.py b/xhr/resources/auth7/corsenabled.py
similarity index 100%
rename from XMLHttpRequest/resources/auth7/corsenabled.py
rename to xhr/resources/auth7/corsenabled.py
diff --git a/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py b/xhr/resources/auth8/corsenabled-no-authorize.py
similarity index 100%
rename from XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
rename to xhr/resources/auth8/corsenabled-no-authorize.py
diff --git a/XMLHttpRequest/resources/auth9/auth.py b/xhr/resources/auth9/auth.py
similarity index 100%
rename from XMLHttpRequest/resources/auth9/auth.py
rename to xhr/resources/auth9/auth.py
diff --git a/XMLHttpRequest/resources/authentication.py b/xhr/resources/authentication.py
similarity index 100%
rename from XMLHttpRequest/resources/authentication.py
rename to xhr/resources/authentication.py
diff --git a/XMLHttpRequest/resources/base.xml b/xhr/resources/base.xml
similarity index 100%
rename from XMLHttpRequest/resources/base.xml
rename to xhr/resources/base.xml
diff --git a/XMLHttpRequest/resources/chunked.py b/xhr/resources/chunked.py
similarity index 100%
rename from XMLHttpRequest/resources/chunked.py
rename to xhr/resources/chunked.py
diff --git a/XMLHttpRequest/resources/conditional.py b/xhr/resources/conditional.py
similarity index 100%
rename from XMLHttpRequest/resources/conditional.py
rename to xhr/resources/conditional.py
diff --git a/XMLHttpRequest/resources/content.py b/xhr/resources/content.py
similarity index 100%
rename from XMLHttpRequest/resources/content.py
rename to xhr/resources/content.py
diff --git a/XMLHttpRequest/resources/corsenabled.py b/xhr/resources/corsenabled.py
similarity index 100%
rename from XMLHttpRequest/resources/corsenabled.py
rename to xhr/resources/corsenabled.py
diff --git a/XMLHttpRequest/resources/delay.py b/xhr/resources/delay.py
similarity index 100%
rename from XMLHttpRequest/resources/delay.py
rename to xhr/resources/delay.py
diff --git a/XMLHttpRequest/resources/echo-headers.py b/xhr/resources/echo-headers.py
similarity index 100%
rename from XMLHttpRequest/resources/echo-headers.py
rename to xhr/resources/echo-headers.py
diff --git a/XMLHttpRequest/resources/echo-method.py b/xhr/resources/echo-method.py
similarity index 100%
rename from XMLHttpRequest/resources/echo-method.py
rename to xhr/resources/echo-method.py
diff --git a/XMLHttpRequest/resources/empty-div-utf8-html.py b/xhr/resources/empty-div-utf8-html.py
similarity index 100%
rename from XMLHttpRequest/resources/empty-div-utf8-html.py
rename to xhr/resources/empty-div-utf8-html.py
diff --git a/XMLHttpRequest/resources/folder.txt b/xhr/resources/folder.txt
similarity index 100%
rename from XMLHttpRequest/resources/folder.txt
rename to xhr/resources/folder.txt
diff --git a/XMLHttpRequest/resources/form.py b/xhr/resources/form.py
similarity index 100%
rename from XMLHttpRequest/resources/form.py
rename to xhr/resources/form.py
diff --git a/XMLHttpRequest/resources/gzip.py b/xhr/resources/gzip.py
similarity index 100%
rename from XMLHttpRequest/resources/gzip.py
rename to xhr/resources/gzip.py
diff --git a/XMLHttpRequest/resources/header-content-length.asis b/xhr/resources/header-content-length.asis
similarity index 100%
rename from XMLHttpRequest/resources/header-content-length.asis
rename to xhr/resources/header-content-length.asis
diff --git a/XMLHttpRequest/resources/headers-basic.asis b/xhr/resources/headers-basic.asis
similarity index 100%
rename from XMLHttpRequest/resources/headers-basic.asis
rename to xhr/resources/headers-basic.asis
diff --git a/XMLHttpRequest/resources/headers.asis b/xhr/resources/headers.asis
similarity index 100%
rename from XMLHttpRequest/resources/headers.asis
rename to xhr/resources/headers.asis
diff --git a/XMLHttpRequest/resources/headers.py b/xhr/resources/headers.py
similarity index 100%
rename from XMLHttpRequest/resources/headers.py
rename to xhr/resources/headers.py
diff --git a/XMLHttpRequest/resources/image.gif b/xhr/resources/image.gif
similarity index 100%
rename from XMLHttpRequest/resources/image.gif
rename to xhr/resources/image.gif
diff --git a/XMLHttpRequest/resources/img-utf8-html.py b/xhr/resources/img-utf8-html.py
similarity index 100%
rename from XMLHttpRequest/resources/img-utf8-html.py
rename to xhr/resources/img-utf8-html.py
diff --git a/XMLHttpRequest/resources/img.jpg b/xhr/resources/img.jpg
similarity index 100%
rename from XMLHttpRequest/resources/img.jpg
rename to xhr/resources/img.jpg
diff --git a/XMLHttpRequest/resources/infinite-redirects.py b/xhr/resources/infinite-redirects.py
similarity index 100%
rename from XMLHttpRequest/resources/infinite-redirects.py
rename to xhr/resources/infinite-redirects.py
diff --git a/XMLHttpRequest/resources/init.htm b/xhr/resources/init.htm
similarity index 100%
rename from XMLHttpRequest/resources/init.htm
rename to xhr/resources/init.htm
diff --git a/XMLHttpRequest/resources/inspect-headers.py b/xhr/resources/inspect-headers.py
similarity index 100%
rename from XMLHttpRequest/resources/inspect-headers.py
rename to xhr/resources/inspect-headers.py
diff --git a/XMLHttpRequest/resources/invalid-utf8-html.py b/xhr/resources/invalid-utf8-html.py
similarity index 100%
rename from XMLHttpRequest/resources/invalid-utf8-html.py
rename to xhr/resources/invalid-utf8-html.py
diff --git a/XMLHttpRequest/resources/last-modified.py b/xhr/resources/last-modified.py
similarity index 100%
rename from XMLHttpRequest/resources/last-modified.py
rename to xhr/resources/last-modified.py
diff --git a/XMLHttpRequest/resources/no-custom-header-on-preflight.py b/xhr/resources/no-custom-header-on-preflight.py
similarity index 100%
rename from XMLHttpRequest/resources/no-custom-header-on-preflight.py
rename to xhr/resources/no-custom-header-on-preflight.py
diff --git a/XMLHttpRequest/resources/nocors/folder.txt b/xhr/resources/nocors/folder.txt
similarity index 100%
rename from XMLHttpRequest/resources/nocors/folder.txt
rename to xhr/resources/nocors/folder.txt
diff --git a/XMLHttpRequest/resources/parse-headers.py b/xhr/resources/parse-headers.py
similarity index 100%
rename from XMLHttpRequest/resources/parse-headers.py
rename to xhr/resources/parse-headers.py
diff --git a/XMLHttpRequest/resources/pass.txt b/xhr/resources/pass.txt
similarity index 100%
rename from XMLHttpRequest/resources/pass.txt
rename to xhr/resources/pass.txt
diff --git a/XMLHttpRequest/resources/redirect-cors.py b/xhr/resources/redirect-cors.py
similarity index 100%
rename from XMLHttpRequest/resources/redirect-cors.py
rename to xhr/resources/redirect-cors.py
diff --git a/XMLHttpRequest/resources/redirect.py b/xhr/resources/redirect.py
similarity index 100%
rename from XMLHttpRequest/resources/redirect.py
rename to xhr/resources/redirect.py
diff --git a/XMLHttpRequest/resources/requri.py b/xhr/resources/requri.py
similarity index 100%
rename from XMLHttpRequest/resources/requri.py
rename to xhr/resources/requri.py
diff --git a/XMLHttpRequest/resources/reset-token.py b/xhr/resources/reset-token.py
similarity index 100%
rename from XMLHttpRequest/resources/reset-token.py
rename to xhr/resources/reset-token.py
diff --git a/XMLHttpRequest/resources/responseType-document-in-worker.js b/xhr/resources/responseType-document-in-worker.js
similarity index 100%
rename from XMLHttpRequest/resources/responseType-document-in-worker.js
rename to xhr/resources/responseType-document-in-worker.js
diff --git a/XMLHttpRequest/resources/responseXML-unavailable-in-worker.js b/xhr/resources/responseXML-unavailable-in-worker.js
similarity index 100%
rename from XMLHttpRequest/resources/responseXML-unavailable-in-worker.js
rename to xhr/resources/responseXML-unavailable-in-worker.js
diff --git a/XMLHttpRequest/resources/send-after-setting-document-domain-window-1.htm b/xhr/resources/send-after-setting-document-domain-window-1.htm
similarity index 100%
rename from XMLHttpRequest/resources/send-after-setting-document-domain-window-1.htm
rename to xhr/resources/send-after-setting-document-domain-window-1.htm
diff --git a/XMLHttpRequest/resources/send-after-setting-document-domain-window-2.htm b/xhr/resources/send-after-setting-document-domain-window-2.htm
similarity index 100%
rename from XMLHttpRequest/resources/send-after-setting-document-domain-window-2.htm
rename to xhr/resources/send-after-setting-document-domain-window-2.htm
diff --git a/XMLHttpRequest/resources/send-after-setting-document-domain-window-helper.js b/xhr/resources/send-after-setting-document-domain-window-helper.js
similarity index 100%
rename from XMLHttpRequest/resources/send-after-setting-document-domain-window-helper.js
rename to xhr/resources/send-after-setting-document-domain-window-helper.js
diff --git a/XMLHttpRequest/resources/shift-jis-html.py b/xhr/resources/shift-jis-html.py
similarity index 100%
rename from XMLHttpRequest/resources/shift-jis-html.py
rename to xhr/resources/shift-jis-html.py
diff --git a/XMLHttpRequest/resources/status.py b/xhr/resources/status.py
similarity index 100%
rename from XMLHttpRequest/resources/status.py
rename to xhr/resources/status.py
diff --git a/XMLHttpRequest/resources/trickle.py b/xhr/resources/trickle.py
similarity index 100%
rename from XMLHttpRequest/resources/trickle.py
rename to xhr/resources/trickle.py
diff --git a/XMLHttpRequest/resources/upload.py b/xhr/resources/upload.py
similarity index 100%
rename from XMLHttpRequest/resources/upload.py
rename to xhr/resources/upload.py
diff --git a/XMLHttpRequest/resources/utf16-bom.json b/xhr/resources/utf16-bom.json
similarity index 100%
rename from XMLHttpRequest/resources/utf16-bom.json
rename to xhr/resources/utf16-bom.json
diff --git a/XMLHttpRequest/resources/utf16.txt b/xhr/resources/utf16.txt
similarity index 100%
rename from XMLHttpRequest/resources/utf16.txt
rename to xhr/resources/utf16.txt
diff --git a/XMLHttpRequest/resources/well-formed.xml b/xhr/resources/well-formed.xml
similarity index 100%
rename from XMLHttpRequest/resources/well-formed.xml
rename to xhr/resources/well-formed.xml
diff --git a/XMLHttpRequest/resources/win-1252-html.py b/xhr/resources/win-1252-html.py
similarity index 100%
rename from XMLHttpRequest/resources/win-1252-html.py
rename to xhr/resources/win-1252-html.py
diff --git a/XMLHttpRequest/resources/win-1252-xml.py b/xhr/resources/win-1252-xml.py
similarity index 100%
rename from XMLHttpRequest/resources/win-1252-xml.py
rename to xhr/resources/win-1252-xml.py
diff --git a/XMLHttpRequest/resources/workerxhr-origin-referrer.js b/xhr/resources/workerxhr-origin-referrer.js
similarity index 100%
rename from XMLHttpRequest/resources/workerxhr-origin-referrer.js
rename to xhr/resources/workerxhr-origin-referrer.js
diff --git a/XMLHttpRequest/resources/workerxhr-simple.js b/xhr/resources/workerxhr-simple.js
similarity index 100%
rename from XMLHttpRequest/resources/workerxhr-simple.js
rename to xhr/resources/workerxhr-simple.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-event-order.js b/xhr/resources/xmlhttprequest-event-order.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-event-order.js
rename to xhr/resources/xmlhttprequest-event-order.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js b/xhr/resources/xmlhttprequest-timeout-aborted.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js
rename to xhr/resources/xmlhttprequest-timeout-aborted.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js b/xhr/resources/xmlhttprequest-timeout-abortedonmain.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js
rename to xhr/resources/xmlhttprequest-timeout-abortedonmain.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js b/xhr/resources/xmlhttprequest-timeout-overrides.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
rename to xhr/resources/xmlhttprequest-timeout-overrides.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js b/xhr/resources/xmlhttprequest-timeout-overridesexpires.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js
rename to xhr/resources/xmlhttprequest-timeout-overridesexpires.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js b/xhr/resources/xmlhttprequest-timeout-runner.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js
rename to xhr/resources/xmlhttprequest-timeout-runner.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js b/xhr/resources/xmlhttprequest-timeout-simple.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js
rename to xhr/resources/xmlhttprequest-timeout-simple.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js b/xhr/resources/xmlhttprequest-timeout-synconmain.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js
rename to xhr/resources/xmlhttprequest-timeout-synconmain.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js b/xhr/resources/xmlhttprequest-timeout-synconworker.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js
rename to xhr/resources/xmlhttprequest-timeout-synconworker.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js b/xhr/resources/xmlhttprequest-timeout-twice.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js
rename to xhr/resources/xmlhttprequest-timeout-twice.js
diff --git a/XMLHttpRequest/resources/xmlhttprequest-timeout.js b/xhr/resources/xmlhttprequest-timeout.js
similarity index 100%
rename from XMLHttpRequest/resources/xmlhttprequest-timeout.js
rename to xhr/resources/xmlhttprequest-timeout.js
diff --git a/XMLHttpRequest/resources/zlib.py b/xhr/resources/zlib.py
similarity index 100%
rename from XMLHttpRequest/resources/zlib.py
rename to xhr/resources/zlib.py
diff --git a/XMLHttpRequest/response-data-arraybuffer.htm b/xhr/response-data-arraybuffer.htm
similarity index 100%
rename from XMLHttpRequest/response-data-arraybuffer.htm
rename to xhr/response-data-arraybuffer.htm
diff --git a/XMLHttpRequest/response-data-blob.htm b/xhr/response-data-blob.htm
similarity index 100%
rename from XMLHttpRequest/response-data-blob.htm
rename to xhr/response-data-blob.htm
diff --git a/XMLHttpRequest/response-data-deflate.htm b/xhr/response-data-deflate.htm
similarity index 100%
rename from XMLHttpRequest/response-data-deflate.htm
rename to xhr/response-data-deflate.htm
diff --git a/XMLHttpRequest/response-data-gzip.htm b/xhr/response-data-gzip.htm
similarity index 100%
rename from XMLHttpRequest/response-data-gzip.htm
rename to xhr/response-data-gzip.htm
diff --git a/XMLHttpRequest/response-data-progress.htm b/xhr/response-data-progress.htm
similarity index 100%
rename from XMLHttpRequest/response-data-progress.htm
rename to xhr/response-data-progress.htm
diff --git a/XMLHttpRequest/response-invalid-responsetype.htm b/xhr/response-invalid-responsetype.htm
similarity index 100%
rename from XMLHttpRequest/response-invalid-responsetype.htm
rename to xhr/response-invalid-responsetype.htm
diff --git a/XMLHttpRequest/response-json.htm b/xhr/response-json.htm
similarity index 100%
rename from XMLHttpRequest/response-json.htm
rename to xhr/response-json.htm
diff --git a/XMLHttpRequest/response-method.htm b/xhr/response-method.htm
similarity index 100%
rename from XMLHttpRequest/response-method.htm
rename to xhr/response-method.htm
diff --git a/XMLHttpRequest/responseText-status.html b/xhr/responseText-status.html
similarity index 100%
rename from XMLHttpRequest/responseText-status.html
rename to xhr/responseText-status.html
diff --git a/XMLHttpRequest/responseType-document-in-worker.html b/xhr/responseType-document-in-worker.html
similarity index 100%
rename from XMLHttpRequest/responseType-document-in-worker.html
rename to xhr/responseType-document-in-worker.html
diff --git a/XMLHttpRequest/responseXML-unavailable-in-worker.html b/xhr/responseXML-unavailable-in-worker.html
similarity index 100%
rename from XMLHttpRequest/responseXML-unavailable-in-worker.html
rename to xhr/responseXML-unavailable-in-worker.html
diff --git a/XMLHttpRequest/responsedocument-decoding.htm b/xhr/responsedocument-decoding.htm
similarity index 100%
rename from XMLHttpRequest/responsedocument-decoding.htm
rename to xhr/responsedocument-decoding.htm
diff --git a/XMLHttpRequest/responsetext-decoding.htm b/xhr/responsetext-decoding.htm
similarity index 100%
rename from XMLHttpRequest/responsetext-decoding.htm
rename to xhr/responsetext-decoding.htm
diff --git a/XMLHttpRequest/responsetype.html b/xhr/responsetype.html
similarity index 100%
rename from XMLHttpRequest/responsetype.html
rename to xhr/responsetype.html
diff --git a/XMLHttpRequest/responseurl.html b/xhr/responseurl.html
similarity index 100%
rename from XMLHttpRequest/responseurl.html
rename to xhr/responseurl.html
diff --git a/XMLHttpRequest/responsexml-basic.htm b/xhr/responsexml-basic.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-basic.htm
rename to xhr/responsexml-basic.htm
diff --git a/XMLHttpRequest/responsexml-document-properties.htm b/xhr/responsexml-document-properties.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-document-properties.htm
rename to xhr/responsexml-document-properties.htm
diff --git a/XMLHttpRequest/responsexml-get-twice.htm b/xhr/responsexml-get-twice.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-get-twice.htm
rename to xhr/responsexml-get-twice.htm
diff --git a/XMLHttpRequest/responsexml-media-type.htm b/xhr/responsexml-media-type.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-media-type.htm
rename to xhr/responsexml-media-type.htm
diff --git a/XMLHttpRequest/responsexml-non-document-types.htm b/xhr/responsexml-non-document-types.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-non-document-types.htm
rename to xhr/responsexml-non-document-types.htm
diff --git a/XMLHttpRequest/responsexml-non-well-formed.htm b/xhr/responsexml-non-well-formed.htm
similarity index 100%
rename from XMLHttpRequest/responsexml-non-well-formed.htm
rename to xhr/responsexml-non-well-formed.htm
diff --git a/XMLHttpRequest/security-consideration.sub.html b/xhr/security-consideration.sub.html
similarity index 93%
rename from XMLHttpRequest/security-consideration.sub.html
rename to xhr/security-consideration.sub.html
index 5eb7110d41a874..a364e2cb8da47a 100644
--- a/XMLHttpRequest/security-consideration.sub.html
+++ b/xhr/security-consideration.sub.html
@@ -28,7 +28,7 @@
           assert_equals(pe.total, 0, "total is zero.");
           this.done();
         });
-        xhr.open("GET", "http://{{host}}:{{ports[http][1]}}/XMLHttpRequest/resources/img.jpg", true);
+        xhr.open("GET", "http://{{host}}:{{ports[http][1]}}/xhr/resources/img.jpg", true);
         xhr.send(null);
       })
     </script>
diff --git a/XMLHttpRequest/send-accept-language.htm b/xhr/send-accept-language.htm
similarity index 100%
rename from XMLHttpRequest/send-accept-language.htm
rename to xhr/send-accept-language.htm
diff --git a/XMLHttpRequest/send-accept.htm b/xhr/send-accept.htm
similarity index 100%
rename from XMLHttpRequest/send-accept.htm
rename to xhr/send-accept.htm
diff --git a/XMLHttpRequest/send-after-setting-document-domain.htm b/xhr/send-after-setting-document-domain.htm
similarity index 97%
rename from XMLHttpRequest/send-after-setting-document-domain.htm
rename to xhr/send-after-setting-document-domain.htm
index 30b6c713cc4278..49eeb955533c0e 100644
--- a/XMLHttpRequest/send-after-setting-document-domain.htm
+++ b/xhr/send-after-setting-document-domain.htm
@@ -9,7 +9,7 @@
   <body>
     <div id="log"></div>
     <script>
-      var test_base_url = location.protocol+'//www2.'+location.host+"/XMLHttpRequest/resources/",
+      var test_base_url = location.protocol+'//www2.'+location.host+"/xhr/resources/",
           test_windows = [
             window.open(test_base_url + "send-after-setting-document-domain-window-1.htm"),
             window.open(test_base_url + "send-after-setting-document-domain-window-2.htm"),
diff --git a/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm b/xhr/send-authentication-basic-cors-not-enabled.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm
rename to xhr/send-authentication-basic-cors-not-enabled.htm
diff --git a/XMLHttpRequest/send-authentication-basic-cors.htm b/xhr/send-authentication-basic-cors.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-cors.htm
rename to xhr/send-authentication-basic-cors.htm
diff --git a/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm b/xhr/send-authentication-basic-repeat-no-args.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-repeat-no-args.htm
rename to xhr/send-authentication-basic-repeat-no-args.htm
diff --git a/XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments.htm b/xhr/send-authentication-basic-setrequestheader-and-arguments.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-setrequestheader-and-arguments.htm
rename to xhr/send-authentication-basic-setrequestheader-and-arguments.htm
diff --git a/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm b/xhr/send-authentication-basic-setrequestheader-existing-session.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm
rename to xhr/send-authentication-basic-setrequestheader-existing-session.htm
diff --git a/XMLHttpRequest/send-authentication-basic-setrequestheader.htm b/xhr/send-authentication-basic-setrequestheader.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic-setrequestheader.htm
rename to xhr/send-authentication-basic-setrequestheader.htm
diff --git a/XMLHttpRequest/send-authentication-basic.htm b/xhr/send-authentication-basic.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-basic.htm
rename to xhr/send-authentication-basic.htm
diff --git a/XMLHttpRequest/send-authentication-competing-names-passwords.htm b/xhr/send-authentication-competing-names-passwords.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-competing-names-passwords.htm
rename to xhr/send-authentication-competing-names-passwords.htm
diff --git a/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm b/xhr/send-authentication-cors-basic-setrequestheader.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm
rename to xhr/send-authentication-cors-basic-setrequestheader.htm
diff --git a/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm b/xhr/send-authentication-cors-setrequestheader-no-cred.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm
rename to xhr/send-authentication-cors-setrequestheader-no-cred.htm
diff --git a/XMLHttpRequest/send-authentication-existing-session-manual.htm b/xhr/send-authentication-existing-session-manual.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-existing-session-manual.htm
rename to xhr/send-authentication-existing-session-manual.htm
diff --git a/XMLHttpRequest/send-authentication-prompt-2-manual.htm b/xhr/send-authentication-prompt-2-manual.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-prompt-2-manual.htm
rename to xhr/send-authentication-prompt-2-manual.htm
diff --git a/XMLHttpRequest/send-authentication-prompt-manual.htm b/xhr/send-authentication-prompt-manual.htm
similarity index 100%
rename from XMLHttpRequest/send-authentication-prompt-manual.htm
rename to xhr/send-authentication-prompt-manual.htm
diff --git a/XMLHttpRequest/send-blob-with-no-mime-type.html b/xhr/send-blob-with-no-mime-type.html
similarity index 100%
rename from XMLHttpRequest/send-blob-with-no-mime-type.html
rename to xhr/send-blob-with-no-mime-type.html
diff --git a/XMLHttpRequest/send-conditional-cors.htm b/xhr/send-conditional-cors.htm
similarity index 100%
rename from XMLHttpRequest/send-conditional-cors.htm
rename to xhr/send-conditional-cors.htm
diff --git a/XMLHttpRequest/send-conditional.htm b/xhr/send-conditional.htm
similarity index 100%
rename from XMLHttpRequest/send-conditional.htm
rename to xhr/send-conditional.htm
diff --git a/XMLHttpRequest/send-content-type-charset.htm b/xhr/send-content-type-charset.htm
similarity index 100%
rename from XMLHttpRequest/send-content-type-charset.htm
rename to xhr/send-content-type-charset.htm
diff --git a/XMLHttpRequest/send-content-type-string.htm b/xhr/send-content-type-string.htm
similarity index 100%
rename from XMLHttpRequest/send-content-type-string.htm
rename to xhr/send-content-type-string.htm
diff --git a/XMLHttpRequest/send-data-arraybuffer.htm b/xhr/send-data-arraybuffer.htm
similarity index 100%
rename from XMLHttpRequest/send-data-arraybuffer.htm
rename to xhr/send-data-arraybuffer.htm
diff --git a/XMLHttpRequest/send-data-arraybufferview.htm b/xhr/send-data-arraybufferview.htm
similarity index 100%
rename from XMLHttpRequest/send-data-arraybufferview.htm
rename to xhr/send-data-arraybufferview.htm
diff --git a/XMLHttpRequest/send-data-blob.htm b/xhr/send-data-blob.htm
similarity index 100%
rename from XMLHttpRequest/send-data-blob.htm
rename to xhr/send-data-blob.htm
diff --git a/XMLHttpRequest/send-data-es-object.htm b/xhr/send-data-es-object.htm
similarity index 100%
rename from XMLHttpRequest/send-data-es-object.htm
rename to xhr/send-data-es-object.htm
diff --git a/XMLHttpRequest/send-data-formdata.htm b/xhr/send-data-formdata.htm
similarity index 100%
rename from XMLHttpRequest/send-data-formdata.htm
rename to xhr/send-data-formdata.htm
diff --git a/XMLHttpRequest/send-data-unexpected-tostring.htm b/xhr/send-data-unexpected-tostring.htm
similarity index 100%
rename from XMLHttpRequest/send-data-unexpected-tostring.htm
rename to xhr/send-data-unexpected-tostring.htm
diff --git a/XMLHttpRequest/send-entity-body-basic.htm b/xhr/send-entity-body-basic.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-basic.htm
rename to xhr/send-entity-body-basic.htm
diff --git a/XMLHttpRequest/send-entity-body-document-bogus.htm b/xhr/send-entity-body-document-bogus.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-document-bogus.htm
rename to xhr/send-entity-body-document-bogus.htm
diff --git a/XMLHttpRequest/send-entity-body-document.htm b/xhr/send-entity-body-document.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-document.htm
rename to xhr/send-entity-body-document.htm
diff --git a/XMLHttpRequest/send-entity-body-empty.htm b/xhr/send-entity-body-empty.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-empty.htm
rename to xhr/send-entity-body-empty.htm
diff --git a/XMLHttpRequest/send-entity-body-get-head-async.htm b/xhr/send-entity-body-get-head-async.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-get-head-async.htm
rename to xhr/send-entity-body-get-head-async.htm
diff --git a/XMLHttpRequest/send-entity-body-get-head.htm b/xhr/send-entity-body-get-head.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-get-head.htm
rename to xhr/send-entity-body-get-head.htm
diff --git a/XMLHttpRequest/send-entity-body-none.htm b/xhr/send-entity-body-none.htm
similarity index 100%
rename from XMLHttpRequest/send-entity-body-none.htm
rename to xhr/send-entity-body-none.htm
diff --git a/XMLHttpRequest/send-network-error-async-events.sub.htm b/xhr/send-network-error-async-events.sub.htm
similarity index 100%
rename from XMLHttpRequest/send-network-error-async-events.sub.htm
rename to xhr/send-network-error-async-events.sub.htm
diff --git a/XMLHttpRequest/send-network-error-sync-events.sub.htm b/xhr/send-network-error-sync-events.sub.htm
similarity index 100%
rename from XMLHttpRequest/send-network-error-sync-events.sub.htm
rename to xhr/send-network-error-sync-events.sub.htm
diff --git a/XMLHttpRequest/send-no-response-event-loadend.htm b/xhr/send-no-response-event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/send-no-response-event-loadend.htm
rename to xhr/send-no-response-event-loadend.htm
diff --git a/XMLHttpRequest/send-no-response-event-loadstart.htm b/xhr/send-no-response-event-loadstart.htm
similarity index 100%
rename from XMLHttpRequest/send-no-response-event-loadstart.htm
rename to xhr/send-no-response-event-loadstart.htm
diff --git a/XMLHttpRequest/send-no-response-event-order.htm b/xhr/send-no-response-event-order.htm
similarity index 100%
rename from XMLHttpRequest/send-no-response-event-order.htm
rename to xhr/send-no-response-event-order.htm
diff --git a/XMLHttpRequest/send-non-same-origin.htm b/xhr/send-non-same-origin.htm
similarity index 100%
rename from XMLHttpRequest/send-non-same-origin.htm
rename to xhr/send-non-same-origin.htm
diff --git a/XMLHttpRequest/send-receive-utf16.htm b/xhr/send-receive-utf16.htm
similarity index 100%
rename from XMLHttpRequest/send-receive-utf16.htm
rename to xhr/send-receive-utf16.htm
diff --git a/XMLHttpRequest/send-redirect-bogus-sync.htm b/xhr/send-redirect-bogus-sync.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-bogus-sync.htm
rename to xhr/send-redirect-bogus-sync.htm
diff --git a/XMLHttpRequest/send-redirect-bogus.htm b/xhr/send-redirect-bogus.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-bogus.htm
rename to xhr/send-redirect-bogus.htm
diff --git a/XMLHttpRequest/send-redirect-infinite-sync.htm b/xhr/send-redirect-infinite-sync.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-infinite-sync.htm
rename to xhr/send-redirect-infinite-sync.htm
diff --git a/XMLHttpRequest/send-redirect-infinite.htm b/xhr/send-redirect-infinite.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-infinite.htm
rename to xhr/send-redirect-infinite.htm
diff --git a/XMLHttpRequest/send-redirect-no-location.htm b/xhr/send-redirect-no-location.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-no-location.htm
rename to xhr/send-redirect-no-location.htm
diff --git a/XMLHttpRequest/send-redirect-post-upload.htm b/xhr/send-redirect-post-upload.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-post-upload.htm
rename to xhr/send-redirect-post-upload.htm
diff --git a/XMLHttpRequest/send-redirect-to-cors.htm b/xhr/send-redirect-to-cors.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-to-cors.htm
rename to xhr/send-redirect-to-cors.htm
diff --git a/XMLHttpRequest/send-redirect-to-non-cors.htm b/xhr/send-redirect-to-non-cors.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect-to-non-cors.htm
rename to xhr/send-redirect-to-non-cors.htm
diff --git a/XMLHttpRequest/send-redirect.htm b/xhr/send-redirect.htm
similarity index 100%
rename from XMLHttpRequest/send-redirect.htm
rename to xhr/send-redirect.htm
diff --git a/XMLHttpRequest/send-response-event-order.htm b/xhr/send-response-event-order.htm
similarity index 100%
rename from XMLHttpRequest/send-response-event-order.htm
rename to xhr/send-response-event-order.htm
diff --git a/XMLHttpRequest/send-response-upload-event-loadend.htm b/xhr/send-response-upload-event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/send-response-upload-event-loadend.htm
rename to xhr/send-response-upload-event-loadend.htm
diff --git a/XMLHttpRequest/send-response-upload-event-loadstart.htm b/xhr/send-response-upload-event-loadstart.htm
similarity index 100%
rename from XMLHttpRequest/send-response-upload-event-loadstart.htm
rename to xhr/send-response-upload-event-loadstart.htm
diff --git a/XMLHttpRequest/send-response-upload-event-progress.htm b/xhr/send-response-upload-event-progress.htm
similarity index 100%
rename from XMLHttpRequest/send-response-upload-event-progress.htm
rename to xhr/send-response-upload-event-progress.htm
diff --git a/XMLHttpRequest/send-send.htm b/xhr/send-send.htm
similarity index 100%
rename from XMLHttpRequest/send-send.htm
rename to xhr/send-send.htm
diff --git a/XMLHttpRequest/send-send.js b/xhr/send-send.js
similarity index 100%
rename from XMLHttpRequest/send-send.js
rename to xhr/send-send.js
diff --git a/XMLHttpRequest/send-send.worker.js b/xhr/send-send.worker.js
similarity index 100%
rename from XMLHttpRequest/send-send.worker.js
rename to xhr/send-send.worker.js
diff --git a/XMLHttpRequest/send-sync-blocks-async.htm b/xhr/send-sync-blocks-async.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-blocks-async.htm
rename to xhr/send-sync-blocks-async.htm
diff --git a/XMLHttpRequest/send-sync-no-response-event-load.htm b/xhr/send-sync-no-response-event-load.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-no-response-event-load.htm
rename to xhr/send-sync-no-response-event-load.htm
diff --git a/XMLHttpRequest/send-sync-no-response-event-loadend.htm b/xhr/send-sync-no-response-event-loadend.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-no-response-event-loadend.htm
rename to xhr/send-sync-no-response-event-loadend.htm
diff --git a/XMLHttpRequest/send-sync-no-response-event-order.htm b/xhr/send-sync-no-response-event-order.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-no-response-event-order.htm
rename to xhr/send-sync-no-response-event-order.htm
diff --git a/XMLHttpRequest/send-sync-response-event-order.htm b/xhr/send-sync-response-event-order.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-response-event-order.htm
rename to xhr/send-sync-response-event-order.htm
diff --git a/XMLHttpRequest/send-sync-timeout.htm b/xhr/send-sync-timeout.htm
similarity index 100%
rename from XMLHttpRequest/send-sync-timeout.htm
rename to xhr/send-sync-timeout.htm
diff --git a/XMLHttpRequest/send-timeout-events.htm b/xhr/send-timeout-events.htm
similarity index 100%
rename from XMLHttpRequest/send-timeout-events.htm
rename to xhr/send-timeout-events.htm
diff --git a/XMLHttpRequest/send-usp.any.js b/xhr/send-usp.any.js
similarity index 100%
rename from XMLHttpRequest/send-usp.any.js
rename to xhr/send-usp.any.js
diff --git a/XMLHttpRequest/setrequestheader-after-send.htm b/xhr/setrequestheader-after-send.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-after-send.htm
rename to xhr/setrequestheader-after-send.htm
diff --git a/XMLHttpRequest/setrequestheader-allow-empty-value.htm b/xhr/setrequestheader-allow-empty-value.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-allow-empty-value.htm
rename to xhr/setrequestheader-allow-empty-value.htm
diff --git a/XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm b/xhr/setrequestheader-allow-whitespace-in-value.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-allow-whitespace-in-value.htm
rename to xhr/setrequestheader-allow-whitespace-in-value.htm
diff --git a/XMLHttpRequest/setrequestheader-before-open.htm b/xhr/setrequestheader-before-open.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-before-open.htm
rename to xhr/setrequestheader-before-open.htm
diff --git a/XMLHttpRequest/setrequestheader-bogus-name.htm b/xhr/setrequestheader-bogus-name.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-bogus-name.htm
rename to xhr/setrequestheader-bogus-name.htm
diff --git a/XMLHttpRequest/setrequestheader-bogus-value.htm b/xhr/setrequestheader-bogus-value.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-bogus-value.htm
rename to xhr/setrequestheader-bogus-value.htm
diff --git a/XMLHttpRequest/setrequestheader-case-insensitive.htm b/xhr/setrequestheader-case-insensitive.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-case-insensitive.htm
rename to xhr/setrequestheader-case-insensitive.htm
diff --git a/XMLHttpRequest/setrequestheader-content-type.htm b/xhr/setrequestheader-content-type.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-content-type.htm
rename to xhr/setrequestheader-content-type.htm
diff --git a/XMLHttpRequest/setrequestheader-header-allowed.htm b/xhr/setrequestheader-header-allowed.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-header-allowed.htm
rename to xhr/setrequestheader-header-allowed.htm
diff --git a/XMLHttpRequest/setrequestheader-header-forbidden.htm b/xhr/setrequestheader-header-forbidden.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-header-forbidden.htm
rename to xhr/setrequestheader-header-forbidden.htm
diff --git a/XMLHttpRequest/setrequestheader-open-setrequestheader.htm b/xhr/setrequestheader-open-setrequestheader.htm
similarity index 100%
rename from XMLHttpRequest/setrequestheader-open-setrequestheader.htm
rename to xhr/setrequestheader-open-setrequestheader.htm
diff --git a/XMLHttpRequest/status-async.htm b/xhr/status-async.htm
similarity index 100%
rename from XMLHttpRequest/status-async.htm
rename to xhr/status-async.htm
diff --git a/XMLHttpRequest/status-basic.htm b/xhr/status-basic.htm
similarity index 100%
rename from XMLHttpRequest/status-basic.htm
rename to xhr/status-basic.htm
diff --git a/XMLHttpRequest/status-error.htm b/xhr/status-error.htm
similarity index 100%
rename from XMLHttpRequest/status-error.htm
rename to xhr/status-error.htm
diff --git a/XMLHttpRequest/template-element.html b/xhr/template-element.html
similarity index 100%
rename from XMLHttpRequest/template-element.html
rename to xhr/template-element.html
diff --git a/XMLHttpRequest/timeout-cors-async.htm b/xhr/timeout-cors-async.htm
similarity index 100%
rename from XMLHttpRequest/timeout-cors-async.htm
rename to xhr/timeout-cors-async.htm
diff --git a/XMLHttpRequest/timeout-multiple-fetches.html b/xhr/timeout-multiple-fetches.html
similarity index 90%
rename from XMLHttpRequest/timeout-multiple-fetches.html
rename to xhr/timeout-multiple-fetches.html
index d2ab4d2c1d305f..30d6b736c56d55 100644
--- a/XMLHttpRequest/timeout-multiple-fetches.html
+++ b/xhr/timeout-multiple-fetches.html
@@ -18,7 +18,7 @@
 
 async_test(t => {
   const client = new XMLHttpRequest
-  client.open("YO", get_host_info().HTTP_REMOTE_ORIGIN + "/XMLHttpRequest/resources/delay.py")
+  client.open("YO", get_host_info().HTTP_REMOTE_ORIGIN + "/xhr/resources/delay.py")
   client.timeout = 1000
   client.send()
   client.ontimeout = t.step_func_done(() => {
diff --git a/XMLHttpRequest/timeout-sync.htm b/xhr/timeout-sync.htm
similarity index 100%
rename from XMLHttpRequest/timeout-sync.htm
rename to xhr/timeout-sync.htm
diff --git a/XMLHttpRequest/xmlhttprequest-basic.htm b/xhr/xmlhttprequest-basic.htm
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-basic.htm
rename to xhr/xmlhttprequest-basic.htm
diff --git a/XMLHttpRequest/xmlhttprequest-eventtarget.htm b/xhr/xmlhttprequest-eventtarget.htm
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-eventtarget.htm
rename to xhr/xmlhttprequest-eventtarget.htm
diff --git a/XMLHttpRequest/xmlhttprequest-network-error-sync.htm b/xhr/xmlhttprequest-network-error-sync.htm
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-network-error-sync.htm
rename to xhr/xmlhttprequest-network-error-sync.htm
diff --git a/XMLHttpRequest/xmlhttprequest-network-error.htm b/xhr/xmlhttprequest-network-error.htm
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-network-error.htm
rename to xhr/xmlhttprequest-network-error.htm
diff --git a/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html b/xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html
rename to xhr/xmlhttprequest-sync-block-defer-scripts-subframe.html
diff --git a/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts.html b/xhr/xmlhttprequest-sync-block-defer-scripts.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts.html
rename to xhr/xmlhttprequest-sync-block-defer-scripts.html
diff --git a/XMLHttpRequest/xmlhttprequest-sync-block-scripts.html b/xhr/xmlhttprequest-sync-block-scripts.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-block-scripts.html
rename to xhr/xmlhttprequest-sync-block-scripts.html
diff --git a/XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html b/xhr/xmlhttprequest-sync-default-feature-policy.sub.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-default-feature-policy.sub.html
rename to xhr/xmlhttprequest-sync-default-feature-policy.sub.html
diff --git a/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html b/xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
rename to xhr/xmlhttprequest-sync-not-hang-scriptloader-subframe.html
diff --git a/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader.html b/xhr/xmlhttprequest-sync-not-hang-scriptloader.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader.html
rename to xhr/xmlhttprequest-sync-not-hang-scriptloader.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-aborted.html b/xhr/xmlhttprequest-timeout-aborted.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-aborted.html
rename to xhr/xmlhttprequest-timeout-aborted.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html b/xhr/xmlhttprequest-timeout-abortedonmain.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html
rename to xhr/xmlhttprequest-timeout-abortedonmain.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-overrides.html b/xhr/xmlhttprequest-timeout-overrides.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-overrides.html
rename to xhr/xmlhttprequest-timeout-overrides.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html b/xhr/xmlhttprequest-timeout-overridesexpires.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html
rename to xhr/xmlhttprequest-timeout-overridesexpires.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-reused.html b/xhr/xmlhttprequest-timeout-reused.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-reused.html
rename to xhr/xmlhttprequest-timeout-reused.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-simple.html b/xhr/xmlhttprequest-timeout-simple.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-simple.html
rename to xhr/xmlhttprequest-timeout-simple.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html b/xhr/xmlhttprequest-timeout-synconmain.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-synconmain.html
rename to xhr/xmlhttprequest-timeout-synconmain.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-twice.html b/xhr/xmlhttprequest-timeout-twice.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-twice.html
rename to xhr/xmlhttprequest-timeout-twice.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html b/xhr/xmlhttprequest-timeout-worker-aborted.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html
rename to xhr/xmlhttprequest-timeout-worker-aborted.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html b/xhr/xmlhttprequest-timeout-worker-overrides.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html
rename to xhr/xmlhttprequest-timeout-worker-overrides.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html b/xhr/xmlhttprequest-timeout-worker-overridesexpires.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html
rename to xhr/xmlhttprequest-timeout-worker-overridesexpires.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html b/xhr/xmlhttprequest-timeout-worker-simple.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html
rename to xhr/xmlhttprequest-timeout-worker-simple.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html b/xhr/xmlhttprequest-timeout-worker-synconworker.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html
rename to xhr/xmlhttprequest-timeout-worker-synconworker.html
diff --git a/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html b/xhr/xmlhttprequest-timeout-worker-twice.html
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html
rename to xhr/xmlhttprequest-timeout-worker-twice.html
diff --git a/XMLHttpRequest/xmlhttprequest-unsent.htm b/xhr/xmlhttprequest-unsent.htm
similarity index 100%
rename from XMLHttpRequest/xmlhttprequest-unsent.htm
rename to xhr/xmlhttprequest-unsent.htm